Removed dodgy session scoping, expanded CallbackController.resolve_controller