Move the callbacks into the separate file