Added Component 2 Class Templates