Improved callback calling