Update for new user schema