Updated User Class with necessary fields