Added a DependencyManager and updated existing controllers