Change label handling to use same process as other schemas