Simplify entity class