Updating code since we no longer have user_name and related fields