Modifying callback handling