Updated ERD and Requirements