Callback enhancements - nearly ready to publish