Updated user and registration schema