(Assignment 5) Completed data model changes and associations