Changes on Validation API