Modified/updated existing user schema

Pull in updated user schema