fixed mapping to play nicely with the new validation mechanism in schematics