Entity
Merging entity classes because yolo