improved creation and changes of entities