[#83401226] Validator syntax refactored