updated active record associations to reflect ERD v 5