Associations

Updated model associations