Updated User class some