Updating the ER Model

Upgrading and updating some entities for the ER Model.