Updates to support setting validation command
Updates to support setting validation command