Updated ERD again