Added structure and item  entities, logic