Added stuff for callbacks as well