Moved ComponentManager dependency to constructor