Added company and social fields to User