Updating the ER Model.

Updating and improving some entities belong to ER Model.