Added controller manager
Added controller manager