Added ComponentManager