Moved ComponentManager dependency to constructor
Removed unused aliases
Added component validation
Docblocks