More changes to ER Diagram