Update to use new validation API