Added a controller manager