Change user.rb for associations