Add Component support.