Entity class tree refactored