Updated to use the new User API.