User model changes as per Suzanne's request.