Removing Singleton from ControllerHandler, forgot