Update to use new UserProvider class