Better structure for controllers.