Added support of components