Added a component manager