Rahul - Moved callback functions to a new namespace. Also added one more callback registering function.
Sumit - Removing merge conflicts