updated models to reflect updated ERD