Adding support for more than one component.