Roll back some type changes from Clientdata to void * and added comments to args