Updated stored command to use new CommandValidator