Modified callback handling