Simplification of ComponentManager