Added support for components