Added keystore and file validators.