Updated User class