Updating entities definition

Upgrading and updating the ER Model and its entities.