Divided the Entity classes