added loading of entities