Adding validator changes
Adding validator changes