ComponentManager and Systems changes