added custom entity ('MyEntity')
minor changes