Add proper has_many relationships