Updated model.rb files