Added Component/Component support