Fixed some incorrect associations and generated a domain model using ERD