Refactor CallbackController