move InstanceValidatedWithOptionalNameKeyValueMapper so it will be found without import