Add rest of the callbacks