Added more user fields