Added support for component-installer