updated models for has_many relationships