Updates to User.php