Updated the UML Diagram and the ERD

Added items to the ERD and reworked the UML diagram