added support of simple components