Refactored CallbackController

- current spec status: 1320 examples, 286 failures