Updating Retrieve command to use new CommandValidator