Added Component Support