Completed data model and added all relations