Redfine User model to match revised schema