Added controller and manager