Changed signature of pointers to callback functions