CallbackManager rewritten