introduced entity composer
removed redundance...