Added support for resource and outcome callbacks