Revised ERD with new Entity names on one page