Added Component and ComponentType