Added Component support.