Modify validate options to include default command evaluation