Improved callback loading