Validator changes
Commit