Adding support for components