Updates to support setting validation command