Added initial ability to add a callback handler