Fixed missing functions to add and remove callbacks