Adding support for components, ids