Move ImportEntitiesCommand out - causing to much problems