Update callback API to pass unit tests