Update user schema (to avoid cherry picking)