Changed some entities in the Entity Model.