More model updates including has_many, belongs_to associations