Added entity class with ability to set parent