From 3e3f636c8e6c25d934475bdac342f76bb67a522c Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sat, 10 Aug 2019 11:37:55 +0100
Subject: [PATCH 01/43] Initial commit for v8

---
 source/.idea/.idea.nuPickers/.idea/.name      |   1 +
 .../.idea.nuPickers/.idea/contentModel.xml    | 407 ++++++++
 .../.idea.nuPickers/.idea/indexLayout.xml     |   8 +
 .../.idea/.idea.nuPickers/.idea/modules.xml   |   8 +
 source/.idea/.idea.nuPickers/.idea/vcs.xml    |   6 +
 .../.idea/.idea.nuPickers/.idea/workspace.xml | 926 ++++++++++++++++++
 source/.idea/.idea.nuPickers/riderModule.iml  |  16 +
 source/nuPickers.Tests/nuPickers.Tests.csproj |   2 +-
 source/nuPickers/Caching/CacheInvalidation.cs |  39 -
 .../CacheInvalidationCompontent.cs            |  69 ++
 .../EmbeddedResourceCompontent.cs}            |  32 +-
 .../Compontents/nuPickerCompontent.cs         |   7 +
 .../EmbeddedResource/EmbeddedResource.cs      |   4 +-
 .../Extensions/IEnumerableStringExtensions.cs |  16 +-
 .../Extensions/IPublishedContentExtensions.cs |   8 +-
 .../Extensions/UmbracoHelperExtensions.cs     |  10 +-
 source/nuPickers/Picker.cs                    |  53 +-
 .../nuPickers/PickerPropertyValueConverter.cs |  37 +-
 .../Shared/CustomLabel/CustomLabel.cs         |   4 +-
 source/nuPickers/nuPickerComposer.cs          |  13 +
 source/nuPickers/nuPickers.csproj             | 288 ++++--
 source/nuPickers/packages.config              |  69 +-
 22 files changed, 1807 insertions(+), 216 deletions(-)
 create mode 100644 source/.idea/.idea.nuPickers/.idea/.name
 create mode 100644 source/.idea/.idea.nuPickers/.idea/contentModel.xml
 create mode 100644 source/.idea/.idea.nuPickers/.idea/indexLayout.xml
 create mode 100644 source/.idea/.idea.nuPickers/.idea/modules.xml
 create mode 100644 source/.idea/.idea.nuPickers/.idea/vcs.xml
 create mode 100644 source/.idea/.idea.nuPickers/.idea/workspace.xml
 create mode 100644 source/.idea/.idea.nuPickers/riderModule.iml
 delete mode 100644 source/nuPickers/Caching/CacheInvalidation.cs
 create mode 100644 source/nuPickers/Compontents/CacheInvalidationCompontent.cs
 rename source/nuPickers/{EmbeddedResource/EmbeddedResourceStartup.cs => Compontents/EmbeddedResourceCompontent.cs} (52%)
 create mode 100644 source/nuPickers/Compontents/nuPickerCompontent.cs
 create mode 100644 source/nuPickers/nuPickerComposer.cs

diff --git a/source/.idea/.idea.nuPickers/.idea/.name b/source/.idea/.idea.nuPickers/.idea/.name
new file mode 100644
index 0000000..aaf1b6e
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/.name
@@ -0,0 +1 @@
+nuPickers
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/contentModel.xml b/source/.idea/.idea.nuPickers/.idea/contentModel.xml
new file mode 100644
index 0000000..227a825
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/contentModel.xml
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelStore">
+    <e p="C:\projects\nuPickers\appveyor.yml" t="Include" />
+    <e p="C:\projects\nuPickers\Build\appveyor-semver.ps1" t="Include" />
+    <e p="C:\projects\nuPickers\Build\check-release-version.ps1" t="Include" />
+    <e p="C:\projects\nuPickers\Build\icon.png" t="Include" />
+    <e p="C:\projects\nuPickers\Build\nuPickers.proj" t="Include" />
+    <e p="C:\projects\nuPickers\Build\package.nuspec" t="Include" />
+    <e p="C:\projects\nuPickers\Build\package.xml" t="Include" />
+    <e p="C:\projects\nuPickers\build-appveyor.cmd" t="Include" />
+    <e p="C:\projects\nuPickers\build.cmd" t="Include" />
+    <e p="C:\projects\nuPickers\source" t="IncludeFlat">
+      <e p=".nuget" t="Include">
+        <e p="NuGet.Config" t="Include" />
+        <e p="NuGet.exe" t="Include" />
+        <e p="NuGet.targets" t="Include" />
+      </e>
+      <e p="Build" t="Include" />
+      <e p="nuPickers" t="IncludeRecursive">
+        <e p="amd64" t="Include">
+          <e p="Microsoft.VC90.CRT" t="Include" />
+        </e>
+        <e p="app.config" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="Caching" t="Include">
+          <e p="Cache.cs" t="Include" />
+          <e p="CacheConstants.cs" t="Include" />
+        </e>
+        <e p="Compontents" t="Include">
+          <e p="CacheInvalidationCompontent.cs" t="Include" />
+          <e p="EmbeddedResourceCompontent.cs" t="Include" />
+          <e p="nuPickerCompontent.cs" t="Include" />
+        </e>
+        <e p="EmbeddedResource" t="Include">
+          <e p="EmbeddedResource.cs" t="Include" />
+          <e p="EmbeddedResourceController.cs" t="Include" />
+          <e p="EmbeddedResourceHelper.cs" t="Include" />
+          <e p="EmbeddedResourceVirtualFile.cs" t="Include" />
+          <e p="EmbeddedResourceVirtualFileProvider.cs" t="Include" />
+          <e p="EmbeddedResourceVirtualFileWriter.cs" t="Include" />
+        </e>
+        <e p="Extensions" t="Include">
+          <e p="IEnumerableStringExtensions.cs" t="Include" />
+          <e p="IPublishedContentExtensions.cs" t="Include" />
+          <e p="UmbracoHelperExtensions.cs" t="Include" />
+        </e>
+        <e p="Helper.cs" t="Include" />
+        <e p="nuPickerComposer.cs" t="Include" />
+        <e p="nuPickers.csproj" t="IncludeRecursive" />
+        <e p="obj" t="ExcludeRecursive" />
+        <e p="packages.config" t="Include" />
+        <e p="Picker.cs" t="Include" />
+        <e p="PickerPropertyValueConverter.cs" t="Include" />
+        <e p="Properties" t="Include">
+          <e p="AssemblyInfo.cs" t="Include" />
+        </e>
+        <e p="PropertyEditors" t="Include">
+          <e p="BasePropertyEditor.cs" t="Include" />
+          <e p="DotNetCheckBoxPicker" t="Include">
+            <e p="DotNetCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetDropDownPicker" t="Include">
+            <e p="DotNetDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetLabels" t="Include">
+            <e p="DotLabelsPropertyEditor.cs" t="Include" />
+            <e p="DotNetLabelsPreValueEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetPagedListPicker" t="Include">
+            <e p="DotNetPagedListPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetPagedListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetPrefetchListPicker" t="Include">
+            <e p="DotNetPrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetPrefetchListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetRadioButtonPicker" t="Include">
+            <e p="DotNetRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="DotNetTypeaheadListPicker" t="Include">
+            <e p="DotNetTypeaheadListPickerPreValueEditor.cs" t="Include" />
+            <e p="DotNetTypeaheadListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="EnumCheckBoxPicker" t="Include">
+            <e p="EnumCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="EnumCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="EnumDropDownPicker" t="Include">
+            <e p="EnumDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="EnumDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="EnumLabels" t="Include">
+            <e p="EnumLabelsPreValueEditor.cs" t="Include" />
+            <e p="EnumLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="EnumPrefetchListPicker" t="Include">
+            <e p="EnumPrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="EnumPrefetchListPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="EnumRadioButtonPicker" t="Include">
+            <e p="EnumRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="EnumRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonCheckBoxPicker" t="Include">
+            <e p="JsonCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonDropDownPicker" t="Include">
+            <e p="JsonDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonLabels" t="Include">
+            <e p="JsonLabelsPreValueEditor.cs" t="Include" />
+            <e p="JsonLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonPagedListPicker" t="Include">
+            <e p="JsonPagedListPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonPagedListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonPrefetchListPicker" t="Include">
+            <e p="JsonPrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonPrefetchListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonRadioButtonPicker" t="Include">
+            <e p="JsonRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="JsonTypeaheadListPicker" t="Include">
+            <e p="JsonTypeaheadListPickerPreValueEditor.cs" t="Include" />
+            <e p="JsonTypeaheadPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LuceneCheckBoxPicker" t="Include">
+            <e p="LuceneCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="LuceneCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LuceneDropDownPicker" t="Include">
+            <e p="LuceneDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="LuceneDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LuceneLabels" t="Include">
+            <e p="LuceneLabelsPreValueEditor.cs" t="Include" />
+            <e p="LuceneLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LucenePagedListPicker" t="Include">
+            <e p="LucenePagedListPickerPreValueEditor.cs" t="Include" />
+            <e p="LucenePagedListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LucenePrefetchListPicker" t="Include">
+            <e p="LucenePrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="LucenePrefetchListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LuceneRadioButtonPicker" t="Include">
+            <e p="LuceneRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="LuceneRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="LuceneTypeaheadPicker" t="Include">
+            <e p="LuceneTypeaheadListPickerPreValueEditor.cs" t="Include" />
+            <e p="LuceneTypeaheadPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="PropertyEditorConstants.cs" t="Include" />
+          <e p="RelationLabels" t="Include">
+            <e p="RelationLabelsPreValueEditor.cs" t="Include" />
+            <e p="RelationLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlCheckBoxPicker" t="Include">
+            <e p="SqlCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlDropDownPicker" t="Include">
+            <e p="SqlDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlLabels" t="Include">
+            <e p="SqlLabelsPreValueEditor.cs" t="Include" />
+            <e p="SqlLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlPagedListPicker" t="Include">
+            <e p="SqlPagedListPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlPagedListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlPrefetchListPicker" t="Include">
+            <e p="SqlPrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlPrefetchListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlRadioButtonPicker" t="Include">
+            <e p="SqlRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="SqlTypeaheadListPicker" t="Include">
+            <e p="SqlTypeaheadListPickerPreValueEditor.cs" t="Include" />
+            <e p="SqlTypeaheadListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlCheckBoxPicker" t="Include">
+            <e p="XmlCheckBoxPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlCheckBoxPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlDropDownPicker" t="Include">
+            <e p="XmlDropDownPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlDropDownPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlLabels" t="Include">
+            <e p="XmlLabelsPreValueEditor.cs" t="Include" />
+            <e p="XmlLabelsPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlPagedListPicker" t="Include">
+            <e p="XmlPagedListPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlPagedListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlPrefetchListPicker" t="Include">
+            <e p="XmlPrefetchListPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlPrefetchListPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlRadioButtonPicker" t="Include">
+            <e p="XmlRadioButtonPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlRadioButtonPickerPropertyEditor.cs" t="Include" />
+          </e>
+          <e p="XmlTypeaheadListPicker" t="Include">
+            <e p="XmlTypeaheadListPickerPreValueEditor.cs" t="Include" />
+            <e p="XmlTypeaheadListPickerPropertyEditor.cs" t="Include" />
+          </e>
+        </e>
+        <e p="Shared" t="Include">
+          <e p="CheckBoxPicker" t="Include">
+            <e p="CheckBoxPickerConfig.html" t="Include" />
+            <e p="CheckBoxPickerEditor.css" t="Include" />
+            <e p="CheckBoxPickerEditor.html" t="Include" />
+            <e p="CheckBoxPickerEditorController.js" t="Include" />
+          </e>
+          <e p="CustomLabel" t="Include">
+            <e p="CustomLabel.cs" t="Include" />
+            <e p="CustomLabelApiController.cs" t="Include" />
+            <e p="CustomLabelConfig.html" t="Include" />
+            <e p="CustomLabelConfigController.js" t="Include" />
+          </e>
+          <e p="DataSource" t="Include">
+            <e p="DataSource.cs" t="Include" />
+            <e p="DataSourceApiController.cs" t="Include" />
+            <e p="DataSourceApiResponse.cs" t="Include" />
+            <e p="DataSourceResource.js" t="Include" />
+            <e p="IDataSource.cs" t="Include" />
+          </e>
+          <e p="DotNetDataSource" t="Include">
+            <e p="DotNetDataSource.cs" t="Include" />
+            <e p="DotNetDataSourceApiController.cs" t="Include" />
+            <e p="DotNetDataSourceAttribute.cs" t="Include" />
+            <e p="DotNetDataSourceConfig.html" t="Include" />
+            <e p="DotNetDataSourceConfigController.js" t="Include" />
+            <e p="DotNetDataSourceProperty.cs" t="Include" />
+            <e p="IDotNetDataSource.cs" t="Include" />
+            <e p="IDotNetDataSourceKeyed.cs" t="Include" />
+            <e p="IDotNetDataSourcePaged.cs" t="Include" />
+            <e p="IDotNetDataSourceTypeahead.cs" t="Include" />
+          </e>
+          <e p="DropDownPicker" t="Include">
+            <e p="DropDownPickerEditor.html" t="Include" />
+            <e p="DropDownPickerEditorController.js" t="Include" />
+          </e>
+          <e p="Editor" t="Include">
+            <e p="Editor.cs" t="Include" />
+            <e p="EditorDataItem.cs" t="Include" />
+            <e p="EditorResource.js" t="Include" />
+          </e>
+          <e p="EnumDataSource" t="Include">
+            <e p="EnumDataSource.cs" t="Include" />
+            <e p="EnumDataSourceApiController.cs" t="Include" />
+            <e p="EnumDataSourceAttribute.cs" t="Include" />
+            <e p="EnumDataSourceConfig.html" t="Include" />
+            <e p="EnumDataSourceConfigController.js" t="Include" />
+            <e p="EnumExtensions.cs" t="Include" />
+          </e>
+          <e p="HiddenConstant" t="Include">
+            <e p="HiddenConstantConfig.html" t="Include" />
+          </e>
+          <e p="JsonDataSource" t="Include">
+            <e p="JsonDataSource.cs" t="Include" />
+            <e p="JsonDataSourceConfig.html" t="Include" />
+            <e p="JsonDataSourceConfigController.js" t="Include" />
+          </e>
+          <e p="Labels" t="Include">
+            <e p="LabelsConfig.html" t="Include" />
+            <e p="LabelsConfigController.js" t="Include" />
+            <e p="LabelsEditor.html" t="Include" />
+            <e p="LabelsEditorController.js" t="Include" />
+          </e>
+          <e p="LayoutDirection" t="Include">
+            <e p="LayoutDirection.css" t="Include" />
+            <e p="LayoutDirectionConfig.html" t="Include" />
+          </e>
+          <e p="ListPicker" t="Include">
+            <e p="ListPickerConfig.html" t="Include" />
+            <e p="ListPickerEditor.css" t="Include" />
+            <e p="ListPickerEditorController.js" t="Include" />
+            <e p="ListPickerEditorDirectives.js" t="Include" />
+            <e p="ListPickerSelectablePartial.html" t="Include" />
+            <e p="ListPickerSelectedPartial.html" t="Include" />
+          </e>
+          <e p="LuceneDataSource" t="Include">
+            <e p="LuceneDataSource.cs" t="Include" />
+            <e p="LuceneDataSourceApiController.cs" t="Include" />
+            <e p="LuceneDataSourceConfig.html" t="Include" />
+            <e p="LuceneDataSourceConfigController.js" t="Include" />
+          </e>
+          <e p="PagedListPicker" t="Include">
+            <e p="PagedListPickerConfig.html" t="Include" />
+            <e p="PagedListPickerEditor.css" t="Include" />
+            <e p="PagedListPickerEditor.html" t="Include" />
+            <e p="PagedListPickerEditorController.js" t="Include" />
+          </e>
+          <e p="Paging" t="Include">
+            <e p="PageMarker.cs" t="Include" />
+          </e>
+          <e p="PrefetchListPicker" t="Include">
+            <e p="PrefetchListPickerConfig.html" t="Include" />
+            <e p="PrefetchListPickerEditor.html" t="Include" />
+            <e p="PrefetchListPickerEditorController.js" t="Include" />
+          </e>
+          <e p="PropertyEditor" t="Include">
+            <e p="PropertyEditorConfig.css" t="Include" />
+          </e>
+          <e p="RadioButtonPicker" t="Include">
+            <e p="RadioButtonPickerEditor.html" t="Include" />
+            <e p="RadioButtonPickerEditorController.js" t="Include" />
+          </e>
+          <e p="RelationDataSource" t="Include">
+            <e p="RelationDataSource.cs" t="Include" />
+            <e p="RelationDataSourceApiController.cs" t="Include" />
+            <e p="RelationDataSourceConfig.html" t="Include" />
+            <e p="RelationDataSourceConfigController.js" t="Include" />
+          </e>
+          <e p="RelationMapping" t="Include">
+            <e p="RelationMapping.cs" t="Include" />
+            <e p="RelationMappingApiController.cs" t="Include" />
+            <e p="RelationMappingComment.cs" t="Include" />
+            <e p="RelationMappingConfig.html" t="Include" />
+            <e p="RelationMappingConfigController.js" t="Include" />
+            <e p="RelationMappingEvent.cs" t="Include" />
+            <e p="RelationMappingResource.js" t="Include" />
+          </e>
+          <e p="SaveFormat" t="Include">
+            <e p="SaveFormat.cs" t="Include" />
+            <e p="SaveFormatConfig.html" t="Include" />
+            <e p="SaveFormatConfigController.js" t="Include" />
+            <e p="SaveFormatPropertyValueEditor.cs" t="Include" />
+            <e p="SaveFormatResource.js" t="Include" />
+          </e>
+          <e p="SqlDataSource" t="Include">
+            <e p="SqlDataSource.cs" t="Include" />
+            <e p="SqlDataSourceApiController.cs" t="Include" />
+            <e p="SqlDataSourceConfig.html" t="Include" />
+            <e p="SqlDataSourceConfigController.js" t="Include" />
+          </e>
+          <e p="TypeaheadListPicker" t="Include">
+            <e p="TypeaheadListPicker.cs" t="Include" />
+            <e p="TypeaheadListPickerConfig.html" t="Include" />
+            <e p="TypeaheadListPickerEditor.html" t="Include" />
+            <e p="TypeaheadListPickerEditorController.js" t="Include" />
+            <e p="TypeaheadListPickerEditorDirectives.js" t="Include" />
+          </e>
+          <e p="XmlDataSource" t="Include">
+            <e p="XmlDataSource.cs" t="Include" />
+            <e p="XmlDataSourceConfig.html" t="Include" />
+            <e p="XmlDataSourceConfigController.js" t="Include" />
+          </e>
+        </e>
+        <e p="x86" t="Include">
+          <e p="Microsoft.VC90.CRT" t="Include" />
+        </e>
+      </e>
+      <e p="nuPickers.sln" t="IncludeFlat" />
+      <e p="nuPickers.Tests" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="EmbeddedResource" t="Include">
+          <e p="EmbeddedResourceHelperTests.cs" t="Include" />
+        </e>
+        <e p="nuPickers.Tests.csproj" t="IncludeRecursive" />
+        <e p="obj" t="ExcludeRecursive" />
+        <e p="Properties" t="Include">
+          <e p="AssemblyInfo.cs" t="Include" />
+        </e>
+      </e>
+      <e p="packages" t="ExcludeRecursive">
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\Microsoft.VC90.CRT\msvcr90.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceca40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlcecompact40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceer40EN.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceme40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceqp40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlcese40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\Microsoft.VC90.CRT\msvcr90.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceca40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlcecompact40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceer40EN.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceme40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceqp40.dll" t="Include" />
+        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlcese40.dll" t="Include" />
+      </e>
+    </e>
+    <e p="C:\Users\abi\.Rider2019.1\system\extResources" t="IncludeRecursive" />
+    <e p="C:\Users\abi\.Rider2019.1\system\resharper-host\local\Transient\ReSharperHost\v191\SolutionCaches\_nuPickers.-334270542.00" t="ExcludeRecursive" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/indexLayout.xml b/source/.idea/.idea.nuPickers/.idea/indexLayout.xml
new file mode 100644
index 0000000..27ba142
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/modules.xml b/source/.idea/.idea.nuPickers/.idea/modules.xml
new file mode 100644
index 0000000..da6e6cd
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.nuPickers/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.nuPickers/riderModule.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/vcs.xml b/source/.idea/.idea.nuPickers/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/workspace.xml b/source/.idea/.idea.nuPickers/.idea/workspace.xml
new file mode 100644
index 0000000..9e6609b
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/.idea/workspace.xml
@@ -0,0 +1,926 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="ab600b7e-aec1-4714-98f5-46aa5af89500" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Picker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Picker.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/packages.config" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/packages.config" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="68">
+              <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+              <folding>
+                <marker date="1565430588374" expanded="true" signature="31:92" ph="{...}" />
+                <marker date="1565430588374" expanded="true" signature="69:90" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="136">
+              <caret line="8" column="47" lean-forward="true" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
+              <folding>
+                <marker date="1565433338777" expanded="true" signature="6:31" ph="..." />
+                <marker date="1565433338777" expanded="true" signature="52:6108" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="65:256" ph="..." />
+                <marker date="1565433338777" expanded="true" signature="439:6106" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="454:659" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
+                <marker date="1565433338777" expanded="true" signature="737:812" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="824:1053" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
+                <marker date="1565433338777" expanded="true" signature="1117:3807" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="1160:3748" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="3817:4287" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
+                <marker date="1565433338777" expanded="true" signature="4488:5416" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="4629:4758" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="4789:4848" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="4894:5129" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="5017:5115" ph="{...}" />
+                <marker date="1565433338777" expanded="true" signature="5426:5877" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
+                <marker date="1565433338777" expanded="true" signature="6039:6096" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5763">
+              <caret line="371" column="21" lean-forward="true" selection-start-line="371" selection-start-column="21" selection-end-line="371" selection-end-column="21" />
+              <folding>
+                <marker date="1565433338946" expanded="true" signature="6:73" ph="..." />
+                <marker date="1565433338946" expanded="true" signature="94:15860" ph="{...}" />
+                <marker date="1565433338946" expanded="false" signature="107:553" ph="..." />
+                <marker date="1565433338946" expanded="true" signature="559:735" ph="/// This class is the main consumer interface ... " />
+                <marker date="1565433338946" expanded="true" signature="759:15858" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="774:896" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
+                <marker date="1565433338946" expanded="true" signature="950:4873" ph="Constructors" />
+                <marker date="1565433338946" expanded="true" signature="980:1485" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
+                <marker date="1565433338946" expanded="true" signature="1575:3756" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="1793:2547" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="1922:2533" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="2588:3529" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="2722:3515" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="2885:3497" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="3556:3746" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="3766:4425" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
+                <marker date="1565433338946" expanded="true" signature="4563:4853" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="4883:9583" ph="Properties" />
+                <marker date="1565433338946" expanded="true" signature="4911:4984" ph="/// the value of this picker ... " />
+                <marker date="1565433338946" expanded="true" signature="5167:5305" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
+                <marker date="1565433338946" expanded="true" signature="5351:6740" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="5377:6497" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="5436:6442" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="5543:6212" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="5822:6188" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="6237:6424" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="6651:6730" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="6750:6877" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
+                <marker date="1565433338946" expanded="true" signature="6921:7157" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="6947:7147" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="7167:7275" ph="/// the relation type alias if relation mapping active, or null ... " />
+                <marker date="1565433338946" expanded="true" signature="7317:7928" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="7343:7918" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="7651:7874" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="7938:8030" ph="/// the id of the content, media or member item ... " />
+                <marker date="1565433338946" expanded="true" signature="8085:8133" ph="/// ... " />
+                <marker date="1565433338946" expanded="true" signature="8186:8296" ph="/// the alias of this picker on the content, media or member item ... " />
+                <marker date="1565433338946" expanded="true" signature="8358:8484" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
+                <marker date="1565433338946" expanded="true" signature="8539:8740" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
+                <marker date="1565433338946" expanded="true" signature="8807:8970" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
+                <marker date="1565433338946" expanded="true" signature="9032:9563" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="9058:9553" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="9198:9537" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="9593:15852" ph="Methods" />
+                <marker date="1565433338946" expanded="true" signature="9618:9794" ph="/// Get all the prevalues for this picker ... " />
+                <marker date="1565433338946" expanded="true" signature="9860:9923" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="9933:10137" ph="/// Find a specific prevalue for this picker ... " />
+                <marker date="1565433338946" expanded="true" signature="10191:10353" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="10363:10833" ph="/// Get a collection of all (key/label) items for this picker ... " />
+                <marker date="1565433338946" expanded="true" signature="10920:11372" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="11382:11623" ph="/// Get a collection of the picked (key/label) items ... " />
+                <marker date="1565433338946" expanded="true" signature="11693:12485" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="11861:12400" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="12495:12740" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
+                <marker date="1565433338946" expanded="true" signature="12891:12968" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="12978:13156" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
+                <marker date="1565433338946" expanded="true" signature="13253:13346" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="13356:13613" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
+                <marker date="1565433338946" expanded="true" signature="13687:14423" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="13732:13826" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="13929:14386" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="14011:14372" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="14085:14354" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="14225:14332" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="14433:14600" ph="/// get all picked items as a collection of Enum ... " />
+                <marker date="1565433338946" expanded="true" signature="14643:15488" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="14819:15451" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="15129:15437" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="15218:15419" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="15299:15397" ph="{...}" />
+                <marker date="1565433338946" expanded="true" signature="15498:15679" ph="/// Returns the string value for this picker ... " />
+                <marker date="1565433338946" expanded="true" signature="15721:15832" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="591">
+              <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="425">
+              <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+              <folding>
+                <marker date="1565431622375" expanded="true" signature="39:5058" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="52:360" ph="..." />
+                <marker date="1565431622375" expanded="true" signature="392:5056" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="456:568" ph="/// return true when there is a published page anywhere on the site ... " />
+                <marker date="1565431622375" expanded="true" signature="756:1007" ph="/// ... " />
+                <marker date="1565431622375" expanded="true" signature="1092:2088" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="1392:1608" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="1625:2077" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="1900:2063" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="2098:2421" ph="/// parses the collection of options, potentially transforming the content of the label ... " />
+                <marker date="1565431622375" expanded="true" signature="2534:3104" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="2794:2971" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="3114:3547" ph="/// ... " />
+                <marker date="1565431622375" expanded="true" signature="3646:4398" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="3741:4361" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="4408:4624" ph="/// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functio ... " />
+                <marker date="1565431622375" expanded="true" signature="4675:5050" ph="{...}" />
+                <marker date="1565431622375" expanded="true" signature="4926:4994" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="19" column="9" lean-forward="true" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
+              <folding>
+                <marker date="1565431206303" expanded="true" signature="6:153" ph="..." />
+                <marker date="1565431206303" expanded="true" signature="186:1226" ph="{...}" />
+                <marker date="1565431206303" expanded="true" signature="280:1224" ph="{...}" />
+                <marker date="1565431206303" expanded="true" signature="316:385" ph="{...}" />
+                <marker date="1565431206303" expanded="true" signature="503:1116" ph="{...}" />
+                <marker date="1565431206303" expanded="true" signature="777:910" ph="{...}" />
+                <marker date="1565431206303" expanded="true" signature="1149:1218" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-112">
+              <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+              <folding>
+                <marker date="1565428945844" expanded="true" signature="36:1450" ph="{...}" />
+                <marker date="1565428945844" expanded="false" signature="49:270" ph="..." />
+                <marker date="1565428945844" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
+                <marker date="1565428945844" expanded="true" signature="425:1448" ph="{...}" />
+                <marker date="1565428945844" expanded="true" signature="610:1221" ph="{...}" />
+                <marker date="1565428945844" expanded="true" signature="636:1018" ph="{...}" />
+                <marker date="1565428945844" expanded="true" signature="790:1004" ph="{...}" />
+                <marker date="1565428945844" expanded="true" signature="1058:1211" ph="{...}" />
+                <marker date="1565428945844" expanded="true" signature="1231:1303" ph="/// Gets the file provider. ... " />
+                <marker date="1565428945844" expanded="true" signature="1352:1442" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+              <folding>
+                <marker date="1565431949211" expanded="true" signature="75:1003" ph="{...}" />
+                <marker date="1565431949211" expanded="false" signature="88:192" ph="..." />
+                <marker date="1565431949211" expanded="true" signature="247:1001" ph="{...}" />
+                <marker date="1565431949211" expanded="true" signature="263:548" ph="/// TODO: migrate out of Picker obj ... " />
+                <marker date="1565431949211" expanded="true" signature="692:995" ph="{...}" />
+                <marker date="1565431949211" expanded="true" signature="783:985" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="741">
+              <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
+              <folding>
+                <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
+                <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
+                <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+                <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+                <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
+                <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="262">
+              <caret line="19" column="13" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+              <folding>
+                <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
+                <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
+                <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
+                <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
+                <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
+                <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
+                <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>AsPublishedContent</find>
+      <find>PickerPropertyValueConverter</find>
+    </findStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Helper.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Picker.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Caching/Cache.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Caching/CacheConstants.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Picker.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectConfigurationFiles">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/vcs.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
+    <option name="y" value="2" />
+    <option name="width" value="1932" />
+    <option name="height" value="1045" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator currentView="SolutionExplorer" proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="FileSystemExplorer" />
+      <pane id="AssemblyExplorer" />
+      <pane id="SolutionExplorer">
+        <subPane>
+          <expand>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Caching" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Compontents" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="EmbeddedResource" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Extensions" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers.Tests" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+            <path>
+              <item name="" type="784c90a0:SolutionExplorerRootNode" />
+              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="nuPickers.Tests" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="EmbeddedResource" type="24d0babc:SolutionExplorerModelNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+        <option name="show-all-files" value="false" />
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
+    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="editor.config.ad.shown" value="true" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="ab600b7e-aec1-4714-98f5-46aa5af89500" name="Default Changelist" comment="" />
+      <created>1565429039837</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1565429039837</updated>
+      <workItem from="1565429042534" duration="4245000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="4245000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-7" y="2" width="1932" height="1045" extended-state="0" />
+    <layout>
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="NuGet" weight="0.32976446" />
+      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Unit Tests" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Performance Profiler" />
+      <window_info anchor="bottom" id="Build" visible="true" weight="0.32976446" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Errors In Solution" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Unit Tests Coverage" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="null" />
+  <component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <breakpoint enabled="true" suspend="NONE" type="DotNet Exception Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="1" />
+        </breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheConstants.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="26" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
+          <folding>
+            <marker date="1565428945830" expanded="true" signature="27:540" ph="{...}" />
+            <marker date="1565428945830" expanded="true" signature="70:538" ph="{...}" />
+            <marker date="1565428945830" expanded="true" signature="85:205" ph="/// key appended with a dataType id - stores all the prevalues for a picker ... " />
+            <marker date="1565428945830" expanded="true" signature="291:470" ph="/// key appended with a context id and property alias - stores picked keys (only applies when picker is in relati ... " />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/Cache.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
+          <folding>
+            <marker date="1565428945829" expanded="true" signature="27:5908" ph="{...}" />
+            <marker date="1565428945829" expanded="false" signature="40:145" ph="..." />
+            <marker date="1565428945829" expanded="true" signature="178:5906" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="193:293" ph="/// Singleton instance of the &lt;see cref=&quot;Cache&quot;/&gt; class ... " />
+            <marker date="1565428945829" expanded="true" signature="362:467" ph="/// Internal instance of the &lt;see cref=&quot;MemoryCache&quot;/&gt; class ... " />
+            <marker date="1565428945829" expanded="true" signature="518:722" ph="/// Locker collection of all cache keys currently having their 'expensive functions' evaluated ... " />
+            <marker date="1565428945829" expanded="true" signature="822:842" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="852:920" ph="/// Private constructor ... " />
+            <marker date="1565428945829" expanded="true" signature="944:1111" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="1121:1200" ph="/// Get the instance of this cache ... " />
+            <marker date="1565428945829" expanded="true" signature="1239:1333" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="1265:1323" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="1343:1652" ph="/// Queries key in cache for object of type T ... " />
+            <marker date="1565428945829" expanded="true" signature="1695:1793" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="1803:2228" ph="/// Queries key in cache for object of type T ... " />
+            <marker date="1565428945829" expanded="true" signature="2287:2535" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="2377:2466" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="2545:3178" ph="/// Queries key in cache for object of type T, otherwise executes expensiveFunc and ensures cache is set ... " />
+            <marker date="1565428945829" expanded="true" signature="3264:4115" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="3386:4071" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="3769:3937" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="4125:4506" ph="/// Populate the cache key with the supplied object ... " />
+            <marker date="1565428945829" expanded="true" signature="4588:5086" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="4637:5076" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="4684:4941" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="4962:5062" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="5096:5243" ph="/// Remove an item from cache ... " />
+            <marker date="1565428945829" expanded="true" signature="5289:5356" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="5366:5605" ph="/// Remove all items from cache for which the lambda returns true ... " />
+            <marker date="1565428945829" expanded="true" signature="5661:5900" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="5743:5890" ph="{...}" />
+            <marker date="1565428945829" expanded="true" signature="5790:5876" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="87">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+          <folding>
+            <marker date="1565428945812" expanded="true" signature="42:4134" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="55:138" ph="..." />
+            <marker date="1565428945812" expanded="true" signature="206:4132" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="636:1209" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="1276:1641" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="1712:2269" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="2335:2700" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="2773:3446" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="3521:4126" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Helper.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+          <folding>
+            <marker date="1565428945849" expanded="true" signature="19:4425" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="32:247" ph="..." />
+            <marker date="1565428945849" expanded="true" signature="281:4423" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="350:1213" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="579:849" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="746:835" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1012:1168" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1223:1411" ph="/// attempts to get an assembly by it's name ... " />
+            <marker date="1565428945849" expanded="true" signature="1477:2314" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1589:1742" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1611:1664" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1698:1728" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1905:2278" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="1939:2173" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="2212:2264" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="2324:2574" ph="/// extension method on Assembly to handle reflection loading exceptions ... " />
+            <marker date="1565428945849" expanded="true" signature="2657:2992" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="2683:2755" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="2805:2887" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="2918:2982" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="3002:3318" ph="/// uses supplied url to check the file system (if prefixed with ~/) else makes an http query ... " />
+            <marker date="1565428945849" expanded="true" signature="3376:4417" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="3471:4381" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="3562:4216" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="3670:3992" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="3827:3970" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="4030:4198" ph="{...}" />
+            <marker date="1565428945849" expanded="true" signature="4293:4367" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
+          <folding>
+            <marker date="1565430596576" expanded="true" signature="6:78" ph="..." />
+            <marker date="1565430596576" expanded="true" signature="99:254" ph="{...}" />
+            <marker date="1565430596576" expanded="true" signature="239:252" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+          <folding>
+            <marker date="1565428946110" expanded="true" signature="26:700" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="39:190" ph="..." />
+            <marker date="1565428946110" expanded="true" signature="303:698" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="356:692" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="566:680" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="92" lean-forward="true" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="92" />
+          <folding>
+            <marker date="1565430979212" expanded="true" signature="6:208" ph="..." />
+            <marker date="1565430979212" expanded="true" signature="241:2367" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="336:2365" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="548:662" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="693:762" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="881:1166" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="1199:1268" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="1362:1542" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="1640:1822" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="1919:2088" ph="{...}" />
+            <marker date="1565430979212" expanded="true" signature="2189:2359" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="23" lean-forward="true" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="12" />
+          <folding>
+            <marker date="1565431253964" expanded="true" signature="36:659" ph="{...}" />
+            <marker date="1565431253964" expanded="true" signature="81:657" ph="{...}" />
+            <marker date="1565431253964" expanded="true" signature="96:180" ph="/// Root url for all embedded resources ... " />
+            <marker date="1565431253964" expanded="true" signature="266:358" ph="/// namespace prefix for all embedded resources ... " />
+            <marker date="1565431253964" expanded="true" signature="437:597" ph="/// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded conte ... " />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-112">
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+          <folding>
+            <marker date="1565428945844" expanded="true" signature="36:1450" ph="{...}" />
+            <marker date="1565428945844" expanded="false" signature="49:270" ph="..." />
+            <marker date="1565428945844" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
+            <marker date="1565428945844" expanded="true" signature="425:1448" ph="{...}" />
+            <marker date="1565428945844" expanded="true" signature="610:1221" ph="{...}" />
+            <marker date="1565428945844" expanded="true" signature="636:1018" ph="{...}" />
+            <marker date="1565428945844" expanded="true" signature="790:1004" ph="{...}" />
+            <marker date="1565428945844" expanded="true" signature="1058:1211" ph="{...}" />
+            <marker date="1565428945844" expanded="true" signature="1231:1303" ph="/// Gets the file provider. ... " />
+            <marker date="1565428945844" expanded="true" signature="1352:1442" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="262">
+          <caret line="19" column="13" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <folding>
+            <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
+            <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
+            <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
+            <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="741">
+          <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
+          <folding>
+            <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
+            <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
+            <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+            <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+            <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+          <folding>
+            <marker date="1565430588374" expanded="true" signature="31:92" ph="{...}" />
+            <marker date="1565430588374" expanded="true" signature="69:90" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="19" column="9" lean-forward="true" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
+          <folding>
+            <marker date="1565431206303" expanded="true" signature="6:153" ph="..." />
+            <marker date="1565431206303" expanded="true" signature="186:1226" ph="{...}" />
+            <marker date="1565431206303" expanded="true" signature="280:1224" ph="{...}" />
+            <marker date="1565431206303" expanded="true" signature="316:385" ph="{...}" />
+            <marker date="1565431206303" expanded="true" signature="503:1116" ph="{...}" />
+            <marker date="1565431206303" expanded="true" signature="777:910" ph="{...}" />
+            <marker date="1565431206303" expanded="true" signature="1149:1218" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+          <folding>
+            <marker date="1565431622375" expanded="true" signature="39:5058" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="52:360" ph="..." />
+            <marker date="1565431622375" expanded="true" signature="392:5056" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="456:568" ph="/// return true when there is a published page anywhere on the site ... " />
+            <marker date="1565431622375" expanded="true" signature="756:1007" ph="/// ... " />
+            <marker date="1565431622375" expanded="true" signature="1092:2088" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="1392:1608" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="1625:2077" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="1900:2063" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="2098:2421" ph="/// parses the collection of options, potentially transforming the content of the label ... " />
+            <marker date="1565431622375" expanded="true" signature="2534:3104" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="2794:2971" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="3114:3547" ph="/// ... " />
+            <marker date="1565431622375" expanded="true" signature="3646:4398" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="3741:4361" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="4408:4624" ph="/// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functio ... " />
+            <marker date="1565431622375" expanded="true" signature="4675:5050" ph="{...}" />
+            <marker date="1565431622375" expanded="true" signature="4926:4994" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+          <folding>
+            <marker date="1565431949211" expanded="true" signature="75:1003" ph="{...}" />
+            <marker date="1565431949211" expanded="false" signature="88:192" ph="..." />
+            <marker date="1565431949211" expanded="true" signature="247:1001" ph="{...}" />
+            <marker date="1565431949211" expanded="true" signature="263:548" ph="/// TODO: migrate out of Picker obj ... " />
+            <marker date="1565431949211" expanded="true" signature="692:995" ph="{...}" />
+            <marker date="1565431949211" expanded="true" signature="783:985" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="591">
+          <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5763">
+          <caret line="371" column="21" lean-forward="true" selection-start-line="371" selection-start-column="21" selection-end-line="371" selection-end-column="21" />
+          <folding>
+            <marker date="1565433338946" expanded="true" signature="6:73" ph="..." />
+            <marker date="1565433338946" expanded="true" signature="94:15860" ph="{...}" />
+            <marker date="1565433338946" expanded="false" signature="107:553" ph="..." />
+            <marker date="1565433338946" expanded="true" signature="559:735" ph="/// This class is the main consumer interface ... " />
+            <marker date="1565433338946" expanded="true" signature="759:15858" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="774:896" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
+            <marker date="1565433338946" expanded="true" signature="950:4873" ph="Constructors" />
+            <marker date="1565433338946" expanded="true" signature="980:1485" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
+            <marker date="1565433338946" expanded="true" signature="1575:3756" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="1793:2547" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="1922:2533" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="2588:3529" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="2722:3515" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="2885:3497" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="3556:3746" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="3766:4425" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
+            <marker date="1565433338946" expanded="true" signature="4563:4853" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="4883:9583" ph="Properties" />
+            <marker date="1565433338946" expanded="true" signature="4911:4984" ph="/// the value of this picker ... " />
+            <marker date="1565433338946" expanded="true" signature="5167:5305" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
+            <marker date="1565433338946" expanded="true" signature="5351:6740" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="5377:6497" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="5436:6442" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="5543:6212" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="5822:6188" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="6237:6424" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="6651:6730" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="6750:6877" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
+            <marker date="1565433338946" expanded="true" signature="6921:7157" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="6947:7147" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="7167:7275" ph="/// the relation type alias if relation mapping active, or null ... " />
+            <marker date="1565433338946" expanded="true" signature="7317:7928" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="7343:7918" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="7651:7874" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="7938:8030" ph="/// the id of the content, media or member item ... " />
+            <marker date="1565433338946" expanded="true" signature="8085:8133" ph="/// ... " />
+            <marker date="1565433338946" expanded="true" signature="8186:8296" ph="/// the alias of this picker on the content, media or member item ... " />
+            <marker date="1565433338946" expanded="true" signature="8358:8484" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
+            <marker date="1565433338946" expanded="true" signature="8539:8740" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
+            <marker date="1565433338946" expanded="true" signature="8807:8970" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
+            <marker date="1565433338946" expanded="true" signature="9032:9563" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="9058:9553" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="9198:9537" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="9593:15852" ph="Methods" />
+            <marker date="1565433338946" expanded="true" signature="9618:9794" ph="/// Get all the prevalues for this picker ... " />
+            <marker date="1565433338946" expanded="true" signature="9860:9923" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="9933:10137" ph="/// Find a specific prevalue for this picker ... " />
+            <marker date="1565433338946" expanded="true" signature="10191:10353" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="10363:10833" ph="/// Get a collection of all (key/label) items for this picker ... " />
+            <marker date="1565433338946" expanded="true" signature="10920:11372" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="11382:11623" ph="/// Get a collection of the picked (key/label) items ... " />
+            <marker date="1565433338946" expanded="true" signature="11693:12485" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="11861:12400" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="12495:12740" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
+            <marker date="1565433338946" expanded="true" signature="12891:12968" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="12978:13156" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
+            <marker date="1565433338946" expanded="true" signature="13253:13346" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="13356:13613" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
+            <marker date="1565433338946" expanded="true" signature="13687:14423" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="13732:13826" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="13929:14386" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="14011:14372" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="14085:14354" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="14225:14332" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="14433:14600" ph="/// get all picked items as a collection of Enum ... " />
+            <marker date="1565433338946" expanded="true" signature="14643:15488" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="14819:15451" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="15129:15437" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="15218:15419" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="15299:15397" ph="{...}" />
+            <marker date="1565433338946" expanded="true" signature="15498:15679" ph="/// Returns the string value for this picker ... " />
+            <marker date="1565433338946" expanded="true" signature="15721:15832" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="8" column="47" lean-forward="true" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
+          <folding>
+            <marker date="1565433338777" expanded="true" signature="6:31" ph="..." />
+            <marker date="1565433338777" expanded="true" signature="52:6108" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="65:256" ph="..." />
+            <marker date="1565433338777" expanded="true" signature="439:6106" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="454:659" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
+            <marker date="1565433338777" expanded="true" signature="737:812" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="824:1053" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
+            <marker date="1565433338777" expanded="true" signature="1117:3807" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="1160:3748" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="3817:4287" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
+            <marker date="1565433338777" expanded="true" signature="4488:5416" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="4629:4758" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="4789:4848" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="4894:5129" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="5017:5115" ph="{...}" />
+            <marker date="1565433338777" expanded="true" signature="5426:5877" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
+            <marker date="1565433338777" expanded="true" signature="6039:6096" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/riderModule.iml b/source/.idea/.idea.nuPickers/riderModule.iml
new file mode 100644
index 0000000..c4eb8e4
--- /dev/null
+++ b/source/.idea/.idea.nuPickers/riderModule.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$/../../../appveyor.yml" />
+    <content url="file://$MODULE_DIR$/../../../build-appveyor.cmd" />
+    <content url="file://$MODULE_DIR$/../../../build.cmd" />
+    <content url="file://$MODULE_DIR$/../../../build/appveyor-semver.ps1" />
+    <content url="file://$MODULE_DIR$/../../../build/check-release-version.ps1" />
+    <content url="file://$MODULE_DIR$/../../../build/icon.png" />
+    <content url="file://$MODULE_DIR$/../../../build/nuPickers.proj" />
+    <content url="file://$MODULE_DIR$/../../../build/package.nuspec" />
+    <content url="file://$MODULE_DIR$/../../../build/package.xml" />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/source/nuPickers.Tests/nuPickers.Tests.csproj b/source/nuPickers.Tests/nuPickers.Tests.csproj
index 4311ae8..5c43fb7 100644
--- a/source/nuPickers.Tests/nuPickers.Tests.csproj
+++ b/source/nuPickers.Tests/nuPickers.Tests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nuPickers.Tests</RootNamespace>
     <AssemblyName>nuPickers.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/source/nuPickers/Caching/CacheInvalidation.cs b/source/nuPickers/Caching/CacheInvalidation.cs
deleted file mode 100644
index a2a055e..0000000
--- a/source/nuPickers/Caching/CacheInvalidation.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace nuPickers.Caching
-{
-    using Umbraco.Core;
-    using Umbraco.Core.Events;
-    using Umbraco.Core.Services;
-    using Umbraco.Core.Models;
-
-    public class CacheInvalidation : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            ContentService.Saved += this.ContentService_Saved;
-            ContentService.Deleted += this.ContentService_Deleted;
-
-            DataTypeService.Saved += this.DataTypeService_Saved;
-            DataTypeService.Deleted += this.DataTypeService_Deleted;
-        }
-
-        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
-        {
-            e.SavedEntities.ForEach(x => Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
-        }
-
-        private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e)
-        {
-            e.DeletedEntities.ForEach(x => Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
-        }
-
-        private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataTypeDefinition> e)
-        {
-            e.SavedEntities.ForEach(x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
-        }
-
-        private void DataTypeService_Deleted(IDataTypeService sender, DeleteEventArgs<IDataTypeDefinition> e)
-        {
-            e.DeletedEntities.ForEach(x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/Compontents/CacheInvalidationCompontent.cs b/source/nuPickers/Compontents/CacheInvalidationCompontent.cs
new file mode 100644
index 0000000..6978eb1
--- /dev/null
+++ b/source/nuPickers/Compontents/CacheInvalidationCompontent.cs
@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using nuPickers.Caching;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace nuPickers.Compontents
+{
+    public class CacheInvalidationCompontent : IComponent, Umbraco.Core.Composing.IComponent
+    {
+        private ContentService _contentService;
+        private DataTypeService _dataTypeService;
+
+        public CacheInvalidationCompontent(ContentService contentService, DataTypeService dataTypeService)
+        {
+            _contentService = contentService;
+            _dataTypeService = dataTypeService;
+        }
+
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
+        {
+            ContentService.Saved += this.ContentService_Saved;
+            ContentService.Deleted += this.ContentService_Deleted;
+
+            DataTypeService.Saved += this.DataTypeService_Saved;
+            DataTypeService.Deleted += this.DataTypeService_Deleted;
+        }
+
+        public void Terminate()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
+        {
+            e.SavedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataType> e)
+        {
+            e.SavedEntities.ToList().ForEach(
+                x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+
+        private void DataTypeService_Deleted(IDataTypeService sender, DeleteEventArgs<IDataType> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs b/source/nuPickers/Compontents/EmbeddedResourceCompontent.cs
similarity index 52%
rename from source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs
rename to source/nuPickers/Compontents/EmbeddedResourceCompontent.cs
index a9d3ec1..b72afeb 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs
+++ b/source/nuPickers/Compontents/EmbeddedResourceCompontent.cs
@@ -1,15 +1,23 @@
-namespace nuPickers.EmbeddedResource
-{
-    using ClientDependency.Core;
-    using System.Web.Mvc;
-    using System.Web.Routing;
-    using Umbraco.Core;
+using System;
+using System.ComponentModel;
+using System.Web.Mvc;
+using System.Web.Routing;
+using ClientDependency.Core;
+using nuPickers.EmbeddedResource;
 
-    public class EmbeddedResourceStartup : ApplicationEventHandler
+namespace nuPickers.Compontents
+{
+    public class EmbeddedResourceCompontent : IComponent, Umbraco.Core.Composing.IComponent
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+        public void Initialize()
         {
-            base.ApplicationStarted(umbracoApplication, applicationContext);
 
             RouteTable
                 .Routes
@@ -26,9 +34,9 @@ protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplica
             FileWriters.AddWriterForExtension(EmbeddedResource.FILE_EXTENSION, new EmbeddedResourceVirtualFileWriter());
         }
 
-        protected override bool ExecuteWhenApplicationNotConfigured
+        public void Terminate()
         {
-            get { return true; }
+            throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/source/nuPickers/Compontents/nuPickerCompontent.cs b/source/nuPickers/Compontents/nuPickerCompontent.cs
new file mode 100644
index 0000000..dcafcce
--- /dev/null
+++ b/source/nuPickers/Compontents/nuPickerCompontent.cs
@@ -0,0 +1,7 @@
+namespace nuPickers.Compontents
+{
+    public class nuPickerCompontent
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index f007e30..6ddb2c1 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -13,8 +13,8 @@ internal static class EmbeddedResource
         internal const string RESOURCE_PREFIX = "nuPickers.Shared.";
 
         /// <summary>
-        /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content 
+        /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = ".nu";      
+        internal const string FILE_EXTENSION = ".nu";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
index 7038db1..748d670 100644
--- a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
+++ b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Extensions
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -7,19 +9,23 @@
 
     internal static class IEnumerableStringExtensions
     {
+
         /// <summary>
         /// TODO: migrate out of Picker obj
         /// parse a collection of strings, and attempt to return a collection of IPublishedContent
         /// </summary>
         /// <param name="keys"></param>
         /// <returns>a collection (populated, or empty)</returns>
-        internal static IEnumerable<IPublishedContent> AsPublishedContent(this IEnumerable<string> keys)
+        internal static IEnumerable<IPublishedContent> AsPublishedContent(this IEnumerable<string> keys, IUmbracoContextFactory contextFactory)
         {
-            UmbracoHelper umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
 
-            return keys
-                    .Select(x => umbracoHelper.GetPublishedContent(x))
+            using (var cf = contextFactory.EnsureUmbracoContext())
+            {
+                var cache = cf.UmbracoContext.ContentCache;
+                return keys
+                    .Select(x =>  cache.GetByRoute(x))
                     .Where(x => x != null);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Extensions/IPublishedContentExtensions.cs b/source/nuPickers/Extensions/IPublishedContentExtensions.cs
index dcf8c2d..a9ad081 100644
--- a/source/nuPickers/Extensions/IPublishedContentExtensions.cs
+++ b/source/nuPickers/Extensions/IPublishedContentExtensions.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Extensions
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using System.Linq;
     using Umbraco.Core.Models;
@@ -13,10 +15,10 @@ public static class IPublishedContentExtensions
         /// <returns>A <see cref="Picker"/> or null</returns>
         public static Picker GetPicker(this IPublishedContent publishedContent, string propertyAlias)
         {
-            var propertyType = publishedContent.ContentType.PropertyTypes.SingleOrDefault(x => x.PropertyTypeAlias == propertyAlias);
+            var propertyType = publishedContent.ContentType.PropertyTypes.SingleOrDefault(x => x.EditorAlias == propertyAlias);
             if (propertyType != null)
             {
-                if (PickerPropertyValueConverter.IsPicker(propertyType.PropertyEditorAlias))
+                if (PickerPropertyValueConverter.IsPicker(propertyType.EditorAlias))
                 {
                     return new Picker(publishedContent.Id, propertyAlias);
                 }
diff --git a/source/nuPickers/Extensions/UmbracoHelperExtensions.cs b/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
index 479452d..b01f04f 100644
--- a/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
+++ b/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Extensions
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using Umbraco.Core.Models;
     using Umbraco.Web;
@@ -26,12 +28,12 @@ internal static IPublishedContent GetPublishedContent(this UmbracoHelper umbraco
         {
             IPublishedContent publishedContent = null;
 
-            publishedContent = umbracoHelper.TypedContent(id);
+            publishedContent = umbracoHelper.Content(id);
 
             if (publishedContent == null)
             {
                 // fallback to attempting to get media
-                publishedContent = umbracoHelper.TypedMedia(id);
+                publishedContent = umbracoHelper.Media(id);
             }
 
             if (publishedContent == null)
@@ -39,7 +41,7 @@ internal static IPublishedContent GetPublishedContent(this UmbracoHelper umbraco
                 // fallback to attempting to get member
                 try
                 {
-                    publishedContent = umbracoHelper.TypedMember(id);
+                    publishedContent = umbracoHelper.Member(id);
                 }
                 catch
                 {
diff --git a/source/nuPickers/Picker.cs b/source/nuPickers/Picker.cs
index 0831bd6..2e41966 100644
--- a/source/nuPickers/Picker.cs
+++ b/source/nuPickers/Picker.cs
@@ -1,4 +1,7 @@
-namespace nuPickers
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers
 {
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
@@ -21,7 +24,7 @@
     /// Umbraco Models Builder will return this class automatically (for the current context)
     /// </summary>
     public class Picker
-    {        
+    {
         /// <summary>
         /// cache var, stores value after querying relations or parsing a save format
         /// </summary>
@@ -30,7 +33,7 @@ public class Picker
         #region Constructors
 
         /// <summary>
-        /// public constructor - picker value is calculated from lookup, either the published value from cache, or the latest saved db value 
+        /// public constructor - picker value is calculated from lookup, either the published value from cache, or the latest saved db value
         /// </summary>
         /// <param name="contextId">the id of the content, media or member</param>
         /// <param name="propertyAlias">the property alias</param>
@@ -42,26 +45,26 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
             var publishedContent = new UmbracoHelper(UmbracoContext.Current).GetPublishedContent(contextId);
 
             if (usePublishedValue && publishedContent != null)
-            {                
+            {
                 var property = publishedContent.GetProperty(propertyAlias);
 
                 if (property != null)
                 {
-                    var propertyType = publishedContent.ContentType.PropertyTypes.Single(x => x.PropertyTypeAlias == property.PropertyTypeAlias);
+                    var propertyType = publishedContent.ContentType.PropertyTypes.Single(x => x.Alias == property.Alias);
 
                     this.ContextId = publishedContent.Id;
                     this.ParentId = (publishedContent.Parent != null) ? publishedContent.Parent.Id : -1;
                     this.PropertyAlias = propertyAlias;
-                    this.DataTypeId = propertyType.DataTypeId;
-                    this.PropertyEditorAlias = propertyType.PropertyEditorAlias;
-                    this.SavedValue = property.Value;
+                    this.DataTypeId = propertyType.DataType.Id;
+                    this.PropertyEditorAlias = propertyType.EditorAlias;
+                    this.SavedValue = property.GetValue();
 
                     success = true;
                 }
             }
             else // use unpublished data
             {
-                var content = ApplicationContext.Current.Services.ContentService.GetById(contextId);
+                var content = Current.Services.ContentService.GetById(contextId);
 
                 if (content != null)
                 {
@@ -69,13 +72,13 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
 
                     if (property != null)
                     {
-                        var propertyType = content.PropertyTypes.Single(x => x.Alias == property.Alias);
+                        var propertyType = content.Properties.Single(x => x.Alias == property.Alias);
 
                         this.ContextId = content.Id;
                         this.ParentId = content.ParentId;
                         this.PropertyAlias = propertyAlias;
-                        this.DataTypeId = propertyType.DataTypeDefinitionId;
-                        this.PropertyEditorAlias = propertyType.PropertyEditorAlias;
+                        this.DataTypeId = propertyType.PropertyType.DataTypeId;
+                        this.PropertyEditorAlias = propertyType.PropertyType.PropertyEditorAlias;
                         this.SavedValue = content.GetValue(PropertyAlias);
 
                         success = true;
@@ -193,7 +196,7 @@ internal string RelationTypeAlias
         internal int ContextId { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         private int ParentId { get; set; }
 
@@ -216,7 +219,7 @@ internal string RelationTypeAlias
         /// <summary>
         /// Property accessor to ensure the query to populate the data-type configruation options is only done once per server
         /// </summary>
-        private IDictionary<string, PreValue> DataTypePreValues
+        private IDictionary<string, object> DataTypePreValues
         {
             get
             {
@@ -237,20 +240,20 @@ private IDictionary<string, PreValue> DataTypePreValues
         #region Methods
 
         /// <summary>
-        /// Get all the prevalues for this picker 
+        /// Get all the prevalues for this picker
         /// </summary>
         /// <returns>collection of all <see cref="PreValue"/> for this datatype</returns>
-        public IDictionary<string, PreValue> GetDataTypePreValues()
+        public IDictionary<string, object> GetDataTypePreValues()
         {
             return this.DataTypePreValues;
         }
 
         /// <summary>
-        /// Find a specific prevalue for this picker 
+        /// Find a specific prevalue for this picker
         /// </summary>
         /// <param name="key"></param>
         /// <returns>the <see cref="PreValue"/> if found, or null</returns>
-        public PreValue GetDataTypePreValue(string key)
+        public object GetDataTypePreValue(string key)
         {
             return this.DataTypePreValues.SingleOrDefault(x => string.Equals(x.Key, key, StringComparison.InvariantCultureIgnoreCase)).Value;
         }
@@ -268,8 +271,8 @@ public IEnumerable<EditorDataItem> GetEditorDataItems(string typeahead = null)
                             this.ContextId,
                             this.ParentId,
                             this.PropertyAlias,
-                            DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").Value),
-                            this.GetDataTypePreValue("customLabel").Value,
+                            DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").ToString()),
+                            this.GetDataTypePreValue("customLabel").ToString(),
                             typeahead);
         }
 
@@ -288,8 +291,8 @@ public IEnumerable<EditorDataItem> GetPickedEditorDataItems()
                                     this.ContextId,
                                     this.ParentId,
                                     this.PropertyAlias,
-                                    DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").Value),
-                                    this.GetDataTypePreValue("customLabel").Value,
+                                    DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").ToString()),
+                                    this.GetDataTypePreValue("customLabel").ToString(),
                                     this.PickedKeys.ToArray());
             }
 
@@ -307,7 +310,7 @@ public IEnumerable<IPublishedContent> AsPublishedContent()
         }
 
         /// <summary>
-        /// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) 
+        /// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic)
         /// </summary>
         /// <returns></returns>
         //[Obsolete("[v2.0.0]")]
@@ -355,11 +358,11 @@ public IEnumerable<T> AsEnums<T>() where T : struct, IConvertible
         public IEnumerable<Enum> AsEnums()
         {
             List<Enum> enums = new List<Enum>();
-            PreValue dataSourceJson = this.GetDataTypePreValue("dataSource");
+            Object dataSourceJson = this.GetDataTypePreValue("dataSource");
 
             if (dataSourceJson != null)
             {
-                EnumDataSource enumDataSouce = JsonConvert.DeserializeObject<EnumDataSource>(dataSourceJson.Value);
+                EnumDataSource enumDataSouce = JsonConvert.DeserializeObject<EnumDataSource>(dataSourceJson.ToString());
 
                 Type enumType = Helper.GetAssembly(enumDataSouce.AssemblyName).GetType(enumDataSouce.EnumName);
 
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index f45c520..2009c4c 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,4 +1,7 @@
-namespace nuPickers
+using System;
+using System.Web;
+
+namespace nuPickers
 {
     using nuPickers.PropertyEditors;
     using System.Linq;
@@ -7,8 +10,8 @@
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web;
 
-    [PropertyValueType(typeof(Picker))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    [PropertyType(typeof(Picker))]
+    [PropertyCache(PropertyCacheValue.All, PropertyCacheLevel.Element)]
     public class PickerPropertyValueConverter : PropertyValueConverterBase
     {
         /// <summary>
@@ -16,11 +19,13 @@ public class PickerPropertyValueConverter : PropertyValueConverterBase
         /// </summary>
         /// <param name="publishedPropertyType"></param>
         /// <returns></returns>
-        public override bool IsConverter(PublishedPropertyType publishedPropertyType)
+        public override bool IsConverter(IPublishedPropertyType propertyType)
         {
-            return PickerPropertyValueConverter.IsPicker(publishedPropertyType.PropertyEditorAlias);
+            return IsPicker(propertyType.EditorAlias);
         }
 
+
+
         /// <summary>
         /// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker
         /// </summary>
@@ -28,7 +33,7 @@ public override bool IsConverter(PublishedPropertyType publishedPropertyType)
         /// <returns></returns>
         public static bool IsPicker(string propertyEditorAlias)
         {
-            return new string[] { 
+            return new string[] {
                         PropertyEditorConstants.DotNetCheckBoxPickerAlias,
                         PropertyEditorConstants.DotNetDropDownPickerAlias,
                         PropertyEditorConstants.DotNetPagedListPickerAlias,
@@ -75,7 +80,8 @@ public static bool IsPicker(string propertyEditorAlias)
         /// <param name="source">expected as a string</param>
         /// <param name="preview"></param>
         /// <returns></returns>
-        public override object ConvertSourceToObject(PublishedPropertyType publishedPropertyType, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
         {
             int contextId = -1;
             int parentId = -1;
@@ -101,12 +107,12 @@ public override object ConvertSourceToObject(PublishedPropertyType publishedProp
             }
 
             return new Picker(
-                        contextId, 
+                        contextId,
                         parentId,
-                        publishedPropertyType.PropertyTypeAlias, 
-                        publishedPropertyType.DataTypeId, 
-                        publishedPropertyType.PropertyEditorAlias, 
-                        source);
+                        propertyType.EditorAlias,
+                        propertyType.DataType.Id,
+                        propertyType.Alias,
+                        inter);
         }
 
         /// <summary>
@@ -117,9 +123,14 @@ public override object ConvertSourceToObject(PublishedPropertyType publishedProp
         /// <param name="source">expected as a string</param>
         /// <param name="preview">flag to indicate if in preview mode</param>
         /// <returns>source as a string, or null</returns>
-        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source,
+            bool preview)
         {
             return source as string;
         }
+
+
+
+
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 4101ef4..10d7bf3 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -28,7 +28,7 @@ internal class CustomLabel
         private string PropertyAlias { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="macroAlias">alias of Macro to execute</param>
         /// <param name="contextId">node, media or member id</param>
@@ -82,7 +82,7 @@ internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDa
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="key">passed by parameter into the macro</param>
         /// <param name="label">value to return if macro fails</param>
diff --git a/source/nuPickers/nuPickerComposer.cs b/source/nuPickers/nuPickerComposer.cs
new file mode 100644
index 0000000..25711e0
--- /dev/null
+++ b/source/nuPickers/nuPickerComposer.cs
@@ -0,0 +1,13 @@
+using nuPickers.Compontents;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace nuPickers
+{
+    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+
+    public class nuPickerComposer : ComponentComposer<nuPickerCompontent>, ICoreComposer
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 45d946f..608c8f7 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nuPickers</RootNamespace>
     <AssemblyName>uComponents.nuPickers</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -38,187 +38,284 @@
     <Reference Include="AutoMapper.Net4">
       <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="businesslogic, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\businesslogic.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="cms, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\cms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="controls, Version=1.0.5556.26333, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\controls.dll</HintPath>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CookComputing.XmlRpcV2">
       <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.60.2941, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ImageProcessor.Web, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="interfaces, Version=1.0.5556.26329, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\interfaces.dll</HintPath>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\log4net.dll</HintPath>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Lucene.Net">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MiniProfiler">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+      <Private>True</Private>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SQLCE4Umbraco, Version=1.0.5556.26332, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\SQLCE4Umbraco.dll</HintPath>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\TidyNet.dll</HintPath>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco, Version=1.0.5556.26334, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.dll</HintPath>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Umbraco.Core, Version=1.0.5556.26329, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Umbraco.Core.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.DataLayer, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.DataLayer.dll</HintPath>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.editorControls, Version=1.0.5556.26335, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.editorControls.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.MacroEngines, Version=1.0.5556.26336, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.MacroEngines.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.providers, Version=1.0.5556.26333, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.providers.dll</HintPath>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UmbracoCms.Core.8.1.1\lib\net472\Umbraco.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=1.0.5556.26336, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Umbraco.Web.UI.dll</HintPath>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Examine.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="UmbracoExamine, Version=0.7.0.26332, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\UmbracoExamine.dll</HintPath>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Caching\Cache.cs" />
     <Compile Include="Caching\CacheConstants.cs" />
-    <Compile Include="Caching\CacheInvalidation.cs" />
+    <Compile Include="Compontents\CacheInvalidationCompontent.cs" />
+    <Compile Include="Compontents\EmbeddedResourceCompontent.cs" />
+    <Compile Include="Compontents\nuPickerCompontent.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
-    <Compile Include="EmbeddedResource\EmbeddedResourceStartup.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFile.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFileProvider.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFileWriter.cs" />
@@ -226,6 +323,7 @@
     <Compile Include="Extensions\IPublishedContentExtensions.cs" />
     <Compile Include="Extensions\UmbracoHelperExtensions.cs" />
     <Compile Include="Helper.cs" />
+    <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
     <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPreValueEditor.cs" />
@@ -510,7 +608,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
   </Target>
+  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/nuPickers/packages.config b/source/nuPickers/packages.config
index ca92a2c..85d862f 100644
--- a/source/nuPickers/packages.config
+++ b/source/nuPickers/packages.config
@@ -1,26 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.60.2941" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
+  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
+  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="LightInject" version="5.4.0" targetFramework="net472" />
+  <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Mvc" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Markdown" version="2.2.1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0-beta1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net472" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
+  <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
+  <package id="NPoco" version="3.9.4" targetFramework="net472" />
+  <package id="Owin" version="1.0" targetFramework="net472" />
+  <package id="Semver" version="2.0.4" targetFramework="net472" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
+  <package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
+  <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.2.3" targetFramework="net45" />
+  <package id="Superpower" version="2.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.1.1" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.1.1" targetFramework="net472" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From bc3ef7c0377b7eee8826a5d801ce5fe3d2e6b932 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sat, 10 Aug 2019 13:59:09 +0100
Subject: [PATCH 02/43] Move events to components, migrate shared logic

---
 .../.idea.nuPickers/.idea/contentModel.xml    |   14 +-
 .../.idea/.idea.nuPickers/.idea/workspace.xml | 1332 +++++++++++------
 source/nuPickers.Tests/nuPickers.Tests.csproj |   14 +
 source/nuPickers.Tests/packages.config        |    4 +
 .../CacheInvalidationComponent.cs}            |    6 +-
 .../EmbeddedResourceCompontent.cs             |   20 +-
 .../RelationMappingComponent.cs}              |   74 +-
 .../nuPickerCompontent.cs                     |    4 +-
 .../EmbeddedResourceVirtualFileWriter.cs      |    8 +-
 .../Extensions/IEnumerableStringExtensions.cs |   14 +-
 source/nuPickers/Picker.cs                    |   29 +-
 .../nuPickers/PickerPropertyValueConverter.cs |    9 +-
 .../DotNetCheckBoxPickerPreValueEditor.cs     |    2 +-
 .../DotNetCheckBoxPickerPropertyEditor.cs     |    8 +-
 .../DotNetDataSource/DotNetDataSource.cs      |    8 +-
 .../Shared/JsonDataSource/JsonDataSource.cs   |   16 +-
 .../LuceneDataSource/LuceneDataSource.cs      |   33 +-
 .../LuceneDataSourceApiController.cs          |    7 +-
 .../RelationDataSource/RelationDataSource.cs  |    6 +-
 .../RelationDataSourceApiController.cs        |   11 +-
 .../Shared/RelationMapping/RelationMapping.cs |   24 +-
 .../RelationMappingApiController.cs           |    2 +-
 .../RelationMapping/RelationMappingComment.cs |   18 +-
 .../SaveFormatPropertyValueEditor.cs          |  107 +-
 .../Shared/SqlDataSource/SqlDataSource.cs     |    6 +-
 .../Shared/XmlDataSource/XmlDataSource.cs     |    8 +-
 source/nuPickers/nuPickerComposer.cs          |   12 +-
 source/nuPickers/nuPickers.csproj             |    8 +-
 28 files changed, 1227 insertions(+), 577 deletions(-)
 create mode 100644 source/nuPickers.Tests/packages.config
 rename source/nuPickers/{Compontents/CacheInvalidationCompontent.cs => Components/CacheInvalidationComponent.cs} (90%)
 rename source/nuPickers/{Compontents => Components}/EmbeddedResourceCompontent.cs (60%)
 rename source/nuPickers/{Shared/RelationMapping/RelationMappingEvent.cs => Components/RelationMappingComponent.cs} (66%)
 rename source/nuPickers/{Compontents => Components}/nuPickerCompontent.cs (55%)

diff --git a/source/.idea/.idea.nuPickers/.idea/contentModel.xml b/source/.idea/.idea.nuPickers/.idea/contentModel.xml
index 227a825..05de993 100644
--- a/source/.idea/.idea.nuPickers/.idea/contentModel.xml
+++ b/source/.idea/.idea.nuPickers/.idea/contentModel.xml
@@ -27,10 +27,11 @@
           <e p="Cache.cs" t="Include" />
           <e p="CacheConstants.cs" t="Include" />
         </e>
-        <e p="Compontents" t="Include">
-          <e p="CacheInvalidationCompontent.cs" t="Include" />
+        <e p="Components" t="Include">
+          <e p="CacheInvalidationComponent.cs" t="Include" />
           <e p="EmbeddedResourceCompontent.cs" t="Include" />
           <e p="nuPickerCompontent.cs" t="Include" />
+          <e p="RelationMappingComponent.cs" t="Include" />
         </e>
         <e p="EmbeddedResource" t="Include">
           <e p="EmbeddedResource.cs" t="Include" />
@@ -337,7 +338,6 @@
             <e p="RelationMappingComment.cs" t="Include" />
             <e p="RelationMappingConfig.html" t="Include" />
             <e p="RelationMappingConfigController.js" t="Include" />
-            <e p="RelationMappingEvent.cs" t="Include" />
             <e p="RelationMappingResource.js" t="Include" />
           </e>
           <e p="SaveFormat" t="Include">
@@ -372,15 +372,7 @@
       </e>
       <e p="nuPickers.sln" t="IncludeFlat" />
       <e p="nuPickers.Tests" t="IncludeRecursive">
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="EmbeddedResource" t="Include">
-          <e p="EmbeddedResourceHelperTests.cs" t="Include" />
-        </e>
         <e p="nuPickers.Tests.csproj" t="IncludeRecursive" />
-        <e p="obj" t="ExcludeRecursive" />
-        <e p="Properties" t="Include">
-          <e p="AssemblyInfo.cs" t="Include" />
-        </e>
       </e>
       <e p="packages" t="ExcludeRecursive">
         <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" t="Include" />
diff --git a/source/.idea/.idea.nuPickers/.idea/workspace.xml b/source/.idea/.idea.nuPickers/.idea/workspace.xml
index 9e6609b..765076e 100644
--- a/source/.idea/.idea.nuPickers/.idea/workspace.xml
+++ b/source/.idea/.idea.nuPickers/.idea/workspace.xml
@@ -2,20 +2,34 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ab600b7e-aec1-4714-98f5-46aa5af89500" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/contentModel.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/nuPickers/Picker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Picker.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/packages.config" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/packages.config" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,258 +40,244 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+            <state relative-caret-position="238">
+              <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
               <folding>
-                <marker date="1565430588374" expanded="true" signature="31:92" ph="{...}" />
-                <marker date="1565430588374" expanded="true" signature="69:90" ph="{...}" />
+                <marker date="1565441391697" expanded="true" signature="6:56" ph="..." />
+                <marker date="1565441391697" expanded="true" signature="103:847" ph="{...}" />
+                <marker date="1565441391697" expanded="true" signature="116:224" ph="..." />
+                <marker date="1565441391697" expanded="true" signature="344:845" ph="{...}" />
+                <marker date="1565441391697" expanded="true" signature="404:839" ph="{...}" />
+                <marker date="1565441391697" expanded="true" signature="651:827" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="47" lean-forward="true" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
+            <state relative-caret-position="1799">
+              <caret line="110" column="100" lean-forward="true" selection-start-line="110" selection-start-column="100" selection-end-line="110" selection-end-column="100" />
               <folding>
-                <marker date="1565433338777" expanded="true" signature="6:31" ph="..." />
-                <marker date="1565433338777" expanded="true" signature="52:6108" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="65:256" ph="..." />
-                <marker date="1565433338777" expanded="true" signature="439:6106" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="454:659" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
-                <marker date="1565433338777" expanded="true" signature="737:812" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="824:1053" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
-                <marker date="1565433338777" expanded="true" signature="1117:3807" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="1160:3748" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="3817:4287" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
-                <marker date="1565433338777" expanded="true" signature="4488:5416" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="4629:4758" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="4789:4848" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="4894:5129" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="5017:5115" ph="{...}" />
-                <marker date="1565433338777" expanded="true" signature="5426:5877" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
-                <marker date="1565433338777" expanded="true" signature="6039:6096" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="73:7220" ph="{...}" />
+                <marker date="1565441516548" expanded="false" signature="86:191" ph="..." />
+                <marker date="1565441516548" expanded="true" signature="197:277" ph="/// the core relation mapping functionality ... " />
+                <marker date="1565441516548" expanded="true" signature="319:7218" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="334:841" ph="/// Get all related id for the supplied criteria ... " />
+                <marker date="1565441516548" expanded="true" signature="979:2983" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="1101:2928" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="1279:2914" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="1886:2204" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="2229:2793" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="2555:2771" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="2993:3484" ph="/// ... " />
+                <marker date="1565441516548" expanded="true" signature="3635:7212" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="3801:7202" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="4382:4702" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="4723:5282" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="5051:5264" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="5534:6850" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="5652:6832" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="5945:6810" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="6134:6515" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="6971:7188" ph="{...}" />
+                <marker date="1565441516548" expanded="true" signature="7051:7170" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5763">
-              <caret line="371" column="21" lean-forward="true" selection-start-line="371" selection-start-column="21" selection-end-line="371" selection-end-column="21" />
+            <state relative-caret-position="296">
+              <caret line="22" column="9" lean-forward="true" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
               <folding>
-                <marker date="1565433338946" expanded="true" signature="6:73" ph="..." />
-                <marker date="1565433338946" expanded="true" signature="94:15860" ph="{...}" />
-                <marker date="1565433338946" expanded="false" signature="107:553" ph="..." />
-                <marker date="1565433338946" expanded="true" signature="559:735" ph="/// This class is the main consumer interface ... " />
-                <marker date="1565433338946" expanded="true" signature="759:15858" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="774:896" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
-                <marker date="1565433338946" expanded="true" signature="950:4873" ph="Constructors" />
-                <marker date="1565433338946" expanded="true" signature="980:1485" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
-                <marker date="1565433338946" expanded="true" signature="1575:3756" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="1793:2547" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="1922:2533" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="2588:3529" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="2722:3515" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="2885:3497" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="3556:3746" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="3766:4425" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
-                <marker date="1565433338946" expanded="true" signature="4563:4853" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="4883:9583" ph="Properties" />
-                <marker date="1565433338946" expanded="true" signature="4911:4984" ph="/// the value of this picker ... " />
-                <marker date="1565433338946" expanded="true" signature="5167:5305" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
-                <marker date="1565433338946" expanded="true" signature="5351:6740" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="5377:6497" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="5436:6442" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="5543:6212" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="5822:6188" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="6237:6424" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="6651:6730" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="6750:6877" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
-                <marker date="1565433338946" expanded="true" signature="6921:7157" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="6947:7147" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="7167:7275" ph="/// the relation type alias if relation mapping active, or null ... " />
-                <marker date="1565433338946" expanded="true" signature="7317:7928" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="7343:7918" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="7651:7874" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="7938:8030" ph="/// the id of the content, media or member item ... " />
-                <marker date="1565433338946" expanded="true" signature="8085:8133" ph="/// ... " />
-                <marker date="1565433338946" expanded="true" signature="8186:8296" ph="/// the alias of this picker on the content, media or member item ... " />
-                <marker date="1565433338946" expanded="true" signature="8358:8484" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
-                <marker date="1565433338946" expanded="true" signature="8539:8740" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
-                <marker date="1565433338946" expanded="true" signature="8807:8970" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
-                <marker date="1565433338946" expanded="true" signature="9032:9563" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="9058:9553" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="9198:9537" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="9593:15852" ph="Methods" />
-                <marker date="1565433338946" expanded="true" signature="9618:9794" ph="/// Get all the prevalues for this picker ... " />
-                <marker date="1565433338946" expanded="true" signature="9860:9923" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="9933:10137" ph="/// Find a specific prevalue for this picker ... " />
-                <marker date="1565433338946" expanded="true" signature="10191:10353" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="10363:10833" ph="/// Get a collection of all (key/label) items for this picker ... " />
-                <marker date="1565433338946" expanded="true" signature="10920:11372" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="11382:11623" ph="/// Get a collection of the picked (key/label) items ... " />
-                <marker date="1565433338946" expanded="true" signature="11693:12485" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="11861:12400" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="12495:12740" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
-                <marker date="1565433338946" expanded="true" signature="12891:12968" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="12978:13156" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
-                <marker date="1565433338946" expanded="true" signature="13253:13346" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="13356:13613" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
-                <marker date="1565433338946" expanded="true" signature="13687:14423" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="13732:13826" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="13929:14386" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="14011:14372" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="14085:14354" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="14225:14332" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="14433:14600" ph="/// get all picked items as a collection of Enum ... " />
-                <marker date="1565433338946" expanded="true" signature="14643:15488" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="14819:15451" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="15129:15437" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="15218:15419" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="15299:15397" ph="{...}" />
-                <marker date="1565433338946" expanded="true" signature="15498:15679" ph="/// Returns the string value for this picker ... " />
-                <marker date="1565433338946" expanded="true" signature="15721:15832" ph="{...}" />
+                <marker date="1565441522112" expanded="true" signature="42:1087" ph="{...}" />
+                <marker date="1565441522112" expanded="false" signature="55:190" ph="..." />
+                <marker date="1565441522112" expanded="true" signature="307:1085" ph="{...}" />
+                <marker date="1565441522112" expanded="true" signature="385:761" ph="{...}" />
+                <marker date="1565441522112" expanded="true" signature="573:749" ph="{...}" />
+                <marker date="1565441522112" expanded="true" signature="949:1079" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="591">
-              <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
+            <state relative-caret-position="-340">
+              <caret line="63" column="13" lean-forward="true" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
+              <folding>
+                <marker date="1565441597254" expanded="true" signature="73:4920" ph="{...}" />
+                <marker date="1565441597254" expanded="false" signature="86:198" ph="..." />
+                <marker date="1565441597254" expanded="true" signature="204:306" ph="/// Represents the data stored in the comment field of a relation ... " />
+                <marker date="1565441597254" expanded="true" signature="346:4918" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="361:458" ph="/// The property alias of the picker using relations ... " />
+                <marker date="1565441597254" expanded="true" signature="526:620" ph="/// Used to identify a specific dataType instance ... " />
+                <marker date="1565441597254" expanded="true" signature="686:762" ph="/// Used to identify a dataType ... " />
+                <marker date="1565441597254" expanded="true" signature="834:1129" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
+                <marker date="1565441597254" expanded="true" signature="1206:2767" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="1518:1657" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="1674:2309" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="1802:1951" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="1972:2295" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="2115:2277" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="2348:2552" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="2569:2757" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="2777:2977" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
+                <marker date="1565441597254" expanded="true" signature="3033:3871" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="3096:3861" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="3130:3636" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="3675:3847" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="3881:4071" ph="/// Helper to determine if the property is inside an Archetype ... " />
+                <marker date="1565441597254" expanded="true" signature="4109:4201" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="4271:4499" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="4297:4413" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="4444:4489" ph="{...}" />
+                <marker date="1565441597254" expanded="true" signature="4509:4639" ph="/// Get the serialized XML comment ... " />
+                <marker date="1565441597254" expanded="true" signature="4676:4911" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+            <state relative-caret-position="1530">
+              <caret line="90" column="69" lean-forward="true" selection-start-line="90" selection-start-column="69" selection-end-line="90" selection-end-column="69" />
               <folding>
-                <marker date="1565431622375" expanded="true" signature="39:5058" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="52:360" ph="..." />
-                <marker date="1565431622375" expanded="true" signature="392:5056" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="456:568" ph="/// return true when there is a published page anywhere on the site ... " />
-                <marker date="1565431622375" expanded="true" signature="756:1007" ph="/// ... " />
-                <marker date="1565431622375" expanded="true" signature="1092:2088" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="1392:1608" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="1625:2077" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="1900:2063" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="2098:2421" ph="/// parses the collection of options, potentially transforming the content of the label ... " />
-                <marker date="1565431622375" expanded="true" signature="2534:3104" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="2794:2971" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="3114:3547" ph="/// ... " />
-                <marker date="1565431622375" expanded="true" signature="3646:4398" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="3741:4361" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="4408:4624" ph="/// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functio ... " />
-                <marker date="1565431622375" expanded="true" signature="4675:5050" ph="{...}" />
-                <marker date="1565431622375" expanded="true" signature="4926:4994" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="6:361" ph="..." />
+                <marker date="1565441879547" expanded="true" signature="393:5226" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="437:5224" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="648:762" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="793:862" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="981:1184" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="1217:1286" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="1379:1458" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="1546:1625" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="1716:1795" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="1805:1988" ph="/// combined event for content / media / member ... " />
+                <marker date="1565441879547" expanded="true" signature="2073:5218" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="2147:5208" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="2368:5194" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="3027:5176" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="3214:4639" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="3299:3429" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="3462:4613" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="3952:4121" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="4187:4352" ph="{...}" />
+                <marker date="1565441879547" expanded="true" signature="4419:4583" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="323">
-              <caret line="19" column="9" lean-forward="true" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
+            <state relative-caret-position="204">
+              <caret line="12" column="61" lean-forward="true" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
               <folding>
-                <marker date="1565431206303" expanded="true" signature="6:153" ph="..." />
-                <marker date="1565431206303" expanded="true" signature="186:1226" ph="{...}" />
-                <marker date="1565431206303" expanded="true" signature="280:1224" ph="{...}" />
-                <marker date="1565431206303" expanded="true" signature="316:385" ph="{...}" />
-                <marker date="1565431206303" expanded="true" signature="503:1116" ph="{...}" />
-                <marker date="1565431206303" expanded="true" signature="777:910" ph="{...}" />
-                <marker date="1565431206303" expanded="true" signature="1149:1218" ph="{...}" />
+                <marker date="1565441897395" expanded="true" signature="6:77" ph="..." />
+                <marker date="1565441897395" expanded="true" signature="98:550" ph="{...}" />
+                <marker date="1565441897395" expanded="true" signature="200:548" ph="{...}" />
+                <marker date="1565441897395" expanded="true" signature="259:542" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-112">
-              <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+            <state relative-caret-position="-102">
+              <caret line="96" column="81" selection-start-line="96" selection-start-column="81" selection-end-line="96" selection-end-column="81" />
               <folding>
-                <marker date="1565428945844" expanded="true" signature="36:1450" ph="{...}" />
-                <marker date="1565428945844" expanded="false" signature="49:270" ph="..." />
-                <marker date="1565428945844" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
-                <marker date="1565428945844" expanded="true" signature="425:1448" ph="{...}" />
-                <marker date="1565428945844" expanded="true" signature="610:1221" ph="{...}" />
-                <marker date="1565428945844" expanded="true" signature="636:1018" ph="{...}" />
-                <marker date="1565428945844" expanded="true" signature="790:1004" ph="{...}" />
-                <marker date="1565428945844" expanded="true" signature="1058:1211" ph="{...}" />
-                <marker date="1565428945844" expanded="true" signature="1231:1303" ph="/// Gets the file provider. ... " />
-                <marker date="1565428945844" expanded="true" signature="1352:1442" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="8:216" ph="..." />
+                <marker date="1565440742160" expanded="true" signature="255:5216" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="268:348" ph="..." />
+                <marker date="1565440742160" expanded="true" signature="354:477" ph="/// This class exists so as to be able to save xml direclty into the Umbraco xml cache ... " />
+                <marker date="1565440742160" expanded="true" signature="544:5214" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="590:758" ph="/// reconstruct values from original (default) property value editor ... " />
+                <marker date="1565440742160" expanded="true" signature="853:1044" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="1118:1235" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="1245:1573" ph="/// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData ... " />
+                <marker date="1565440742160" expanded="true" signature="1698:1989" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="1817:1891" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="1922:1979" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="2088:3221" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="2307:2558" ph="/* mandatory and regex validators cannot be part of valueEditor.Validators because they ... */" />
+                <marker date="1565440742160" expanded="true" signature="2585:2789" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="2934:3142" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="3231:3331" ph="/// A collection of validators for the pre value editor ... " />
+                <marker date="1565440742160" expanded="true" signature="3448:3577" ph="/// Gets the validator used to validate the special property type -level &quot;required&quot;. ... " />
+                <marker date="1565440742160" expanded="true" signature="3672:3799" ph="/// Gets the validator used to validate the special property type -level &quot;format&quot;. ... " />
+                <marker date="1565440742160" expanded="true" signature="3973:4049" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="4180:4256" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="4432:4508" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="4620:4696" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="4812:4888" ph="{...}" />
+                <marker date="1565440742160" expanded="true" signature="4975:5083" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+            <state relative-caret-position="499">
+              <caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
               <folding>
-                <marker date="1565431949211" expanded="true" signature="75:1003" ph="{...}" />
-                <marker date="1565431949211" expanded="false" signature="88:192" ph="..." />
-                <marker date="1565431949211" expanded="true" signature="247:1001" ph="{...}" />
-                <marker date="1565431949211" expanded="true" signature="263:548" ph="/// TODO: migrate out of Picker obj ... " />
-                <marker date="1565431949211" expanded="true" signature="692:995" ph="{...}" />
-                <marker date="1565431949211" expanded="true" signature="783:985" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="6:181" ph="..." />
+                <marker date="1565435304332" expanded="true" signature="213:1510" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="307:1508" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="441:500" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="532:601" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="720:1400" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="1023:1156" ph="{...}" />
+                <marker date="1565435304332" expanded="true" signature="1433:1502" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="741">
-              <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
+            <state relative-caret-position="160">
+              <caret line="56" column="68" lean-forward="true" selection-start-line="56" selection-start-column="68" selection-end-line="56" selection-end-column="95" />
               <folding>
-                <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
-                <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
-                <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-                <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-                <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
-                <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
+                <marker date="1565441918806" expanded="false" signature="6:208" ph="..." />
+                <marker date="1565441918806" expanded="true" signature="240:2364" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="334:2362" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="545:659" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="690:759" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="878:1163" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="1196:1265" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="1359:1539" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="1637:1819" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="1916:2085" ph="{...}" />
+                <marker date="1565441918806" expanded="true" signature="2186:2356" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
+        <entry file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="262">
-              <caret line="19" column="13" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+            <state relative-caret-position="85">
+              <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
               <folding>
-                <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
-                <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
-                <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
-                <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
-                <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
-                <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
-                <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
+                <marker date="1565435225174" expanded="true" signature="30:83" ph="{...}" />
+                <marker date="1565435225174" expanded="true" signature="68:81" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -287,39 +287,62 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>AsPublishedContent</find>
+      <find>PropertyCacheLevel.Element</find>
       <find>PickerPropertyValueConverter</find>
+      <find>AsDynamicPublishedContent</find>
+      <find>AsPublishedContent</find>
+      <find>AsDynamic</find>
+      <find>LuceneDataSource</find>
+      <find>ApplicationContext.</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Helper.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Picker.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileProvider.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceController.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Caching/Cache.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/nuPickers/Caching/CacheConstants.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFile.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceHelper.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" />
         <option value="$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" />
         <option value="$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs" />
         <option value="$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" />
         <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs" />
@@ -328,9 +351,31 @@
         <option value="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" />
         <option value="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" />
         <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Picker.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" />
         <option value="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Picker.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" />
+        <option value="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" />
       </list>
     </option>
   </component>
@@ -371,36 +416,27 @@
               <item name="" type="784c90a0:SolutionExplorerRootNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Caching" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Components" type="24d0babc:SolutionExplorerModelNode" />
             </path>
             <path>
               <item name="" type="784c90a0:SolutionExplorerRootNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Compontents" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
             </path>
             <path>
               <item name="" type="784c90a0:SolutionExplorerRootNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="EmbeddedResource" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="RelationMapping" type="24d0babc:SolutionExplorerModelNode" />
             </path>
             <path>
               <item name="" type="784c90a0:SolutionExplorerRootNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
               <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Extensions" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers.Tests" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers.Tests" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="EmbeddedResource" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
+              <item name="SaveFormat" type="24d0babc:SolutionExplorerModelNode" />
             </path>
           </expand>
           <select />
@@ -439,12 +475,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1565429039837</updated>
-      <workItem from="1565429042534" duration="4245000" />
+      <workItem from="1565429042534" duration="10392000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4245000" />
+    <option name="totallyTimeSpent" value="10392000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -457,6 +493,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="2" width="1932" height="1045" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Favorites" side_tool="true" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
@@ -464,12 +501,12 @@
       <window_info anchor="bottom" id="NuGet" weight="0.32976446" />
       <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Version Control" visible="true" weight="0.32976446" />
       <window_info anchor="bottom" id="Unit Tests" />
       <window_info anchor="bottom" id="Terminal" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Performance Profiler" />
-      <window_info anchor="bottom" id="Build" visible="true" weight="0.32976446" />
+      <window_info anchor="bottom" id="Build" weight="0.32976446" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -555,24 +592,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-          <folding>
-            <marker date="1565428945812" expanded="true" signature="42:4134" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="55:138" ph="..." />
-            <marker date="1565428945812" expanded="true" signature="206:4132" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="636:1209" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="1276:1641" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="1712:2269" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="2335:2700" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="2773:3446" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="3521:4126" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/nuPickers/Helper.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -610,63 +629,75 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
-          <folding>
-            <marker date="1565430596576" expanded="true" signature="6:78" ph="..." />
-            <marker date="1565430596576" expanded="true" signature="99:254" ph="{...}" />
-            <marker date="1565430596576" expanded="true" signature="239:252" ph="{...}" />
-          </folding>
+        <state relative-caret-position="272">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+        <state relative-caret-position="85">
+          <caret line="5" column="23" lean-forward="true" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="741">
+          <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
           <folding>
-            <marker date="1565428946110" expanded="true" signature="26:700" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="39:190" ph="..." />
-            <marker date="1565428946110" expanded="true" signature="303:698" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="356:692" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="566:680" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
+            <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
+            <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+            <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
+            <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
+            <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        <state relative-caret-position="408">
+          <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+          <folding>
+            <marker date="1565435018168" expanded="true" signature="104:854" ph="{...}" />
+            <marker date="1565435018168" expanded="false" signature="117:221" ph="..." />
+            <marker date="1565435018168" expanded="true" signature="276:852" ph="{...}" />
+            <marker date="1565435018168" expanded="true" signature="292:577" ph="/// TODO: migrate out of Picker obj ... " />
+            <marker date="1565435018168" expanded="true" signature="682:846" ph="{...}" />
+            <marker date="1565435018168" expanded="true" signature="694:836" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="92" lean-forward="true" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="92" />
+        <state relative-caret-position="58">
+          <caret line="7" column="51" lean-forward="true" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
           <folding>
-            <marker date="1565430979212" expanded="true" signature="6:208" ph="..." />
-            <marker date="1565430979212" expanded="true" signature="241:2367" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="336:2365" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="548:662" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="693:762" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="881:1166" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="1199:1268" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="1362:1542" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="1640:1822" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="1919:2088" ph="{...}" />
-            <marker date="1565430979212" expanded="true" signature="2189:2359" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
+            <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
+            <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
+            <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
+            <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs">
+    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="23" lean-forward="true" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
+        <state relative-caret-position="591">
+          <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
         </state>
       </provider>
     </entry>
@@ -684,92 +715,269 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceController.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-112">
-          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        <state relative-caret-position="102">
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
           <folding>
-            <marker date="1565428945844" expanded="true" signature="36:1450" ph="{...}" />
-            <marker date="1565428945844" expanded="false" signature="49:270" ph="..." />
-            <marker date="1565428945844" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
-            <marker date="1565428945844" expanded="true" signature="425:1448" ph="{...}" />
-            <marker date="1565428945844" expanded="true" signature="610:1221" ph="{...}" />
-            <marker date="1565428945844" expanded="true" signature="636:1018" ph="{...}" />
-            <marker date="1565428945844" expanded="true" signature="790:1004" ph="{...}" />
-            <marker date="1565428945844" expanded="true" signature="1058:1211" ph="{...}" />
-            <marker date="1565428945844" expanded="true" signature="1231:1303" ph="/// Gets the file provider. ... " />
-            <marker date="1565428945844" expanded="true" signature="1352:1442" ph="{...}" />
+            <marker date="1565428945833" expanded="true" signature="36:975" ph="{...}" />
+            <marker date="1565428945833" expanded="false" signature="49:110" ph="..." />
+            <marker date="1565428945833" expanded="true" signature="116:219" ph="/// Handles returning embedded resource files (html, css, js, png) ... " />
+            <marker date="1565428945833" expanded="true" signature="276:973" ph="{...}" />
+            <marker date="1565428945833" expanded="true" signature="356:790" ph="{...}" />
+            <marker date="1565428945833" expanded="true" signature="625:739" ph="{...}" />
+            <marker date="1565428945833" expanded="true" signature="843:967" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceHelper.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="19" column="13" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="51">
+          <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
           <folding>
-            <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
-            <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
-            <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
-            <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="36:2509" ph="{...}" />
+            <marker date="1565428945840" expanded="false" signature="49:128" ph="..." />
+            <marker date="1565428945840" expanded="true" signature="178:2507" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="193:465" ph="/// Determine if a resource exists for the given resource name ... " />
+            <marker date="1565428945840" expanded="true" signature="530:746" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="756:978" ph="/// Gets the stream for the given resource name ... " />
+            <marker date="1565428945840" expanded="true" signature="1042:1528" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="1383:1492" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="1538:1852" ph="/// Convert a url for an embedded resource, to a namespaced string for an embedded resource ... " />
+            <marker date="1565428945840" expanded="true" signature="1920:2501" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="2093:2184" ph="{...}" />
+            <marker date="1565428945840" expanded="true" signature="2261:2457" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFile.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="741">
-          <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
+        <state relative-caret-position="102">
+          <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
           <folding>
-            <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
-            <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
-            <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-            <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-            <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
+            <marker date="1565428945842" expanded="true" signature="36:1517" ph="{...}" />
+            <marker date="1565428945842" expanded="false" signature="49:107" ph="..." />
+            <marker date="1565428945842" expanded="true" signature="113:189" ph="/// The embedded resource virtual file. ... " />
+            <marker date="1565428945842" expanded="true" signature="251:1515" ph="{...}" />
+            <marker date="1565428945842" expanded="true" signature="266:331" ph="/// The virtual file ... " />
+            <marker date="1565428945842" expanded="true" signature="386:755" ph="/// Initializes a new instance of the &lt;see cref=&quot;EmbeddedResourceVirtualFile&quot;/&gt; class.  ... " />
+            <marker date="1565428945842" expanded="true" signature="818:882" ph="{...}" />
+            <marker date="1565428945842" expanded="true" signature="892:1125" ph="/// When overridden in a derived class, returns a read-only stream to the virtual resource. ... " />
+            <marker date="1565428945842" expanded="true" signature="1154:1344" ph="{...}" />
+            <marker date="1565428945842" expanded="true" signature="1354:1417" ph="/// Gets the path. ... " />
+            <marker date="1565428945842" expanded="true" signature="1444:1509" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileProvider.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
+          <folding>
+            <marker date="1565428945843" expanded="true" signature="36:1091" ph="{...}" />
+            <marker date="1565428945843" expanded="false" signature="49:104" ph="..." />
+            <marker date="1565428945843" expanded="true" signature="110:151" ph="///  ... " />
+            <marker date="1565428945843" expanded="true" signature="234:1089" ph="{...}" />
+            <marker date="1565428945843" expanded="true" signature="249:377" ph="///  ... " />
+            <marker date="1565428945843" expanded="true" signature="428:748" ph="{...}" />
+            <marker date="1565428945843" expanded="true" signature="758:886" ph="///  ... " />
+            <marker date="1565428945843" expanded="true" signature="942:1083" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-928">
+          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+          <folding>
+            <marker date="1565428945812" expanded="true" signature="42:4134" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="55:138" ph="..." />
+            <marker date="1565428945812" expanded="true" signature="206:4132" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="636:1209" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="1276:1641" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="1712:2269" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="2335:2700" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="2773:3446" ph="{...}" />
+            <marker date="1565428945812" expanded="true" signature="3521:4126" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="95" column="13" selection-start-line="95" selection-start-column="13" selection-end-line="95" selection-end-column="13" />
+          <folding>
+            <marker date="1565434436984" expanded="true" signature="6:60" ph="..." />
+            <marker date="1565434436984" expanded="true" signature="81:6077" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="94:285" ph="..." />
+            <marker date="1565434436984" expanded="true" signature="361:6075" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="413:433" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="443:648" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
+            <marker date="1565434436984" expanded="true" signature="726:801" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="813:1042" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
+            <marker date="1565434436984" expanded="true" signature="1106:3796" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="1149:3737" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="3806:4276" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
+            <marker date="1565434436984" expanded="true" signature="4477:5385" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="4618:4727" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="4758:4817" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="4863:5098" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="4986:5084" ph="{...}" />
+            <marker date="1565434436984" expanded="true" signature="5395:5846" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
+            <marker date="1565434436984" expanded="true" signature="6008:6065" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-354">
+          <caret line="303" column="53" selection-start-line="303" selection-start-column="35" selection-end-line="303" selection-end-column="53" />
+          <folding>
+            <marker date="1565434905086" expanded="true" signature="6:72" ph="..." />
+            <marker date="1565434905086" expanded="true" signature="93:15579" ph="{...}" />
+            <marker date="1565434905086" expanded="false" signature="106:552" ph="..." />
+            <marker date="1565434905086" expanded="true" signature="558:734" ph="/// This class is the main consumer interface ... " />
+            <marker date="1565434905086" expanded="true" signature="758:15577" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="773:895" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
+            <marker date="1565434905086" expanded="true" signature="949:4806" ph="Constructors" />
+            <marker date="1565434905086" expanded="true" signature="979:1484" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
+            <marker date="1565434905086" expanded="true" signature="1574:3689" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="1760:2480" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="1889:2466" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="2521:3462" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="2655:3448" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="2818:3430" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="3489:3679" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="3699:4358" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
+            <marker date="1565434905086" expanded="true" signature="4496:4786" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="4816:9329" ph="Properties" />
+            <marker date="1565434905086" expanded="true" signature="4844:4917" ph="/// the value of this picker ... " />
+            <marker date="1565434905086" expanded="true" signature="5100:5238" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
+            <marker date="1565434905086" expanded="true" signature="5284:6678" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="5310:6435" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="5369:6380" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="5481:6150" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="5760:6126" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="6175:6362" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="6589:6668" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="6688:6815" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
+            <marker date="1565434905086" expanded="true" signature="6859:7095" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="6885:7085" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="7105:7213" ph="/// the relation type alias if relation mapping active, or null ... " />
+            <marker date="1565434905086" expanded="true" signature="7255:7874" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="7281:7864" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="7592:7820" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="7884:7976" ph="/// the id of the content, media or member item ... " />
+            <marker date="1565434905086" expanded="true" signature="8031:8079" ph="/// ... " />
+            <marker date="1565434905086" expanded="true" signature="8132:8242" ph="/// the alias of this picker on the content, media or member item ... " />
+            <marker date="1565434905086" expanded="true" signature="8304:8430" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
+            <marker date="1565434905086" expanded="true" signature="8485:8686" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
+            <marker date="1565434905086" expanded="true" signature="8753:8916" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
+            <marker date="1565434905086" expanded="true" signature="8978:9309" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="9004:9299" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="9143:9283" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="9339:15571" ph="Methods" />
+            <marker date="1565434905086" expanded="true" signature="9364:9540" ph="/// Get all the prevalues for this picker ... " />
+            <marker date="1565434905086" expanded="true" signature="9606:9669" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="9679:9883" ph="/// Find a specific prevalue for this picker ... " />
+            <marker date="1565434905086" expanded="true" signature="9937:10099" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="10109:10579" ph="/// Get a collection of all (key/label) items for this picker ... " />
+            <marker date="1565434905086" expanded="true" signature="10666:11118" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="11128:11369" ph="/// Get a collection of the picked (key/label) items ... " />
+            <marker date="1565434905086" expanded="true" signature="11439:12231" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="11607:12146" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="12241:12486" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
+            <marker date="1565434905086" expanded="true" signature="12637:12714" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="12724:12902" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
+            <marker date="1565434905086" expanded="true" signature="12999:13065" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13075:13332" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
+            <marker date="1565434905086" expanded="true" signature="13406:14142" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13451:13545" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13648:14105" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13730:14091" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13804:14073" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="13944:14051" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="14152:14319" ph="/// get all picked items as a collection of Enum ... " />
+            <marker date="1565434905086" expanded="true" signature="14362:15207" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="14538:15170" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="14848:15156" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="14937:15138" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="15018:15116" ph="{...}" />
+            <marker date="1565434905086" expanded="true" signature="15217:15398" ph="/// Returns the string value for this picker ... " />
+            <marker date="1565434905086" expanded="true" signature="15440:15551" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
+          <folding>
+            <marker date="1565435438866" expanded="true" signature="84:2594" ph="{...}" />
+            <marker date="1565435438866" expanded="false" signature="97:273" ph="..." />
+            <marker date="1565435438866" expanded="true" signature="2434:2592" ph="{...}" />
+            <marker date="1565435438866" expanded="true" signature="2505:2586" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
-          <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+          <caret line="5" column="44" lean-forward="true" selection-start-line="5" selection-start-column="44" selection-end-line="5" selection-end-column="44" />
           <folding>
-            <marker date="1565430588374" expanded="true" signature="31:92" ph="{...}" />
-            <marker date="1565430588374" expanded="true" signature="69:90" ph="{...}" />
+            <marker date="1565435372411" expanded="true" signature="56:1322" ph="{...}" />
+            <marker date="1565435372411" expanded="false" signature="69:136" ph="..." />
+            <marker date="1565435372411" expanded="true" signature="214:1320" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" column="9" lean-forward="true" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
+        <state relative-caret-position="143">
+          <caret line="35" column="11" selection-start-line="35" selection-start-column="11" selection-end-line="36" />
+          <folding>
+            <marker date="1565434078848" expanded="true" signature="36:1636" ph="{...}" />
+            <marker date="1565434078848" expanded="false" signature="49:270" ph="..." />
+            <marker date="1565434078848" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
+            <marker date="1565434078848" expanded="true" signature="425:1634" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="567:626" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="806:1407" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="832:1214" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="986:1200" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="1254:1397" ph="{...}" />
+            <marker date="1565434078848" expanded="true" signature="1417:1489" ph="/// Gets the file provider. ... " />
+            <marker date="1565434078848" expanded="true" signature="1538:1628" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
           <folding>
-            <marker date="1565431206303" expanded="true" signature="6:153" ph="..." />
-            <marker date="1565431206303" expanded="true" signature="186:1226" ph="{...}" />
-            <marker date="1565431206303" expanded="true" signature="280:1224" ph="{...}" />
-            <marker date="1565431206303" expanded="true" signature="316:385" ph="{...}" />
-            <marker date="1565431206303" expanded="true" signature="503:1116" ph="{...}" />
-            <marker date="1565431206303" expanded="true" signature="777:910" ph="{...}" />
-            <marker date="1565431206303" expanded="true" signature="1149:1218" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="26:700" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="39:190" ph="..." />
+            <marker date="1565428946110" expanded="true" signature="303:698" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="356:692" ph="{...}" />
+            <marker date="1565428946110" expanded="true" signature="566:680" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+        <state relative-caret-position="-1506">
+          <caret line="25" column="43" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
           <folding>
             <marker date="1565431622375" expanded="true" signature="39:5058" ph="{...}" />
             <marker date="1565431622375" expanded="true" signature="52:360" ph="..." />
@@ -793,131 +1001,387 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="51">
+          <caret line="94" selection-start-line="94" selection-end-line="95" />
           <folding>
-            <marker date="1565431949211" expanded="true" signature="75:1003" ph="{...}" />
-            <marker date="1565431949211" expanded="false" signature="88:192" ph="..." />
-            <marker date="1565431949211" expanded="true" signature="247:1001" ph="{...}" />
-            <marker date="1565431949211" expanded="true" signature="263:548" ph="/// TODO: migrate out of Picker obj ... " />
-            <marker date="1565431949211" expanded="true" signature="692:995" ph="{...}" />
-            <marker date="1565431949211" expanded="true" signature="783:985" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="41:4635" ph="{...}" />
+            <marker date="1565438963951" expanded="false" signature="54:270" ph="..." />
+            <marker date="1565438963951" expanded="true" signature="317:4633" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="440:499" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="870:945" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="1057:1165" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="1300:1517" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="1527:1785" ph="/// Main method for retrieving nuPicker data items. ... " />
+            <marker date="1565438963951" expanded="true" signature="1863:4627" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="2154:2249" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="2297:2443" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="2476:4524" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="2680:3123" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="2887:3049" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="3160:4510" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="3259:3373" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="3429:3606" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="3648:4492" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="3775:4470" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="4060:4444" ph="{...}" />
+            <marker date="1565438963951" expanded="true" signature="4237:4412" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="591">
-          <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
+        <state relative-caret-position="163">
+          <caret line="142" column="17" lean-forward="true" selection-start-line="142" selection-start-column="17" selection-end-line="142" selection-end-column="17" />
+          <folding>
+            <marker date="1565439039353" expanded="true" signature="43:6220" ph="{...}" />
+            <marker date="1565439039353" expanded="false" signature="56:260" ph="..." />
+            <marker date="1565439039353" expanded="true" signature="309:6218" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="434:493" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="916:2021" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="1362:1974" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="1444:1620" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="2133:3203" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="2579:3123" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="2657:2769" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="3338:5187" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="3809:5140" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="3957:4548" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="4569:5126" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="5278:6212" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="5447:6202" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="5526:5997" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="5707:5979" ph="{...}" />
+            <marker date="1565439039353" expanded="true" signature="6018:6188" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5763">
-          <caret line="371" column="21" lean-forward="true" selection-start-line="371" selection-start-column="21" selection-end-line="371" selection-end-column="21" />
-          <folding>
-            <marker date="1565433338946" expanded="true" signature="6:73" ph="..." />
-            <marker date="1565433338946" expanded="true" signature="94:15860" ph="{...}" />
-            <marker date="1565433338946" expanded="false" signature="107:553" ph="..." />
-            <marker date="1565433338946" expanded="true" signature="559:735" ph="/// This class is the main consumer interface ... " />
-            <marker date="1565433338946" expanded="true" signature="759:15858" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="774:896" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
-            <marker date="1565433338946" expanded="true" signature="950:4873" ph="Constructors" />
-            <marker date="1565433338946" expanded="true" signature="980:1485" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
-            <marker date="1565433338946" expanded="true" signature="1575:3756" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="1793:2547" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="1922:2533" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="2588:3529" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="2722:3515" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="2885:3497" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="3556:3746" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="3766:4425" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
-            <marker date="1565433338946" expanded="true" signature="4563:4853" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="4883:9583" ph="Properties" />
-            <marker date="1565433338946" expanded="true" signature="4911:4984" ph="/// the value of this picker ... " />
-            <marker date="1565433338946" expanded="true" signature="5167:5305" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
-            <marker date="1565433338946" expanded="true" signature="5351:6740" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="5377:6497" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="5436:6442" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="5543:6212" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="5822:6188" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="6237:6424" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="6651:6730" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="6750:6877" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
-            <marker date="1565433338946" expanded="true" signature="6921:7157" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="6947:7147" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="7167:7275" ph="/// the relation type alias if relation mapping active, or null ... " />
-            <marker date="1565433338946" expanded="true" signature="7317:7928" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="7343:7918" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="7651:7874" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="7938:8030" ph="/// the id of the content, media or member item ... " />
-            <marker date="1565433338946" expanded="true" signature="8085:8133" ph="/// ... " />
-            <marker date="1565433338946" expanded="true" signature="8186:8296" ph="/// the alias of this picker on the content, media or member item ... " />
-            <marker date="1565433338946" expanded="true" signature="8358:8484" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
-            <marker date="1565433338946" expanded="true" signature="8539:8740" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
-            <marker date="1565433338946" expanded="true" signature="8807:8970" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
-            <marker date="1565433338946" expanded="true" signature="9032:9563" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="9058:9553" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="9198:9537" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="9593:15852" ph="Methods" />
-            <marker date="1565433338946" expanded="true" signature="9618:9794" ph="/// Get all the prevalues for this picker ... " />
-            <marker date="1565433338946" expanded="true" signature="9860:9923" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="9933:10137" ph="/// Find a specific prevalue for this picker ... " />
-            <marker date="1565433338946" expanded="true" signature="10191:10353" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="10363:10833" ph="/// Get a collection of all (key/label) items for this picker ... " />
-            <marker date="1565433338946" expanded="true" signature="10920:11372" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="11382:11623" ph="/// Get a collection of the picked (key/label) items ... " />
-            <marker date="1565433338946" expanded="true" signature="11693:12485" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="11861:12400" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="12495:12740" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
-            <marker date="1565433338946" expanded="true" signature="12891:12968" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="12978:13156" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
-            <marker date="1565433338946" expanded="true" signature="13253:13346" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="13356:13613" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
-            <marker date="1565433338946" expanded="true" signature="13687:14423" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="13732:13826" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="13929:14386" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="14011:14372" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="14085:14354" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="14225:14332" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="14433:14600" ph="/// get all picked items as a collection of Enum ... " />
-            <marker date="1565433338946" expanded="true" signature="14643:15488" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="14819:15451" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="15129:15437" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="15218:15419" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="15299:15397" ph="{...}" />
-            <marker date="1565433338946" expanded="true" signature="15498:15679" ph="/// Returns the string value for this picker ... " />
-            <marker date="1565433338946" expanded="true" signature="15721:15832" ph="{...}" />
+        <state relative-caret-position="1547">
+          <caret line="99" column="60" selection-start-line="99" selection-start-column="60" selection-end-line="99" selection-end-column="60" />
+          <folding>
+            <marker date="1565434377347" expanded="true" signature="71:6009" ph="{...}" />
+            <marker date="1565434377347" expanded="false" signature="84:302" ph="..." />
+            <marker date="1565434377347" expanded="true" signature="348:6007" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="655:876" ph="/// ... " />
+            <marker date="1565434377347" expanded="true" signature="990:1075" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="1187:1305" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="1440:1667" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="1760:6001" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="1921:2757" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="2795:5954" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="2908:4046" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="3334:3897" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="4442:5940" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="4481:4691" ph="/* media xml is wrapped in a &lt;Media id=&quot;-1&quot; /&gt; node to be valid, exclude this from any results ... */" />
+            <marker date="1565434377347" expanded="true" signature="4970:5922" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="5252:5900" ph="{...}" />
+            <marker date="1565434377347" expanded="true" signature="5752:5872" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="493">
+          <caret line="51" column="15" lean-forward="true" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
+          <folding>
+            <marker date="1565440770576" expanded="true" signature="54:2421" ph="{...}" />
+            <marker date="1565440770576" expanded="false" signature="67:288" ph="..." />
+            <marker date="1565440770576" expanded="true" signature="334:2419" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="692:806" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="918:1054" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="1189:1434" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="1444:1569" ph="/// ... " />
+            <marker date="1565440770576" expanded="true" signature="1672:2413" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="1866:2366" ph="{...}" />
+            <marker date="1565440770576" expanded="true" signature="2172:2258" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="14" column="100" selection-start-line="14" selection-start-column="100" selection-end-line="14" selection-end-column="120" />
+          <folding>
+            <marker date="1565440802073" expanded="true" signature="67:519" ph="{...}" />
+            <marker date="1565440802073" expanded="true" signature="80:188" ph="..." />
+            <marker date="1565440802073" expanded="true" signature="306:517" ph="{...}" />
+            <marker date="1565440802073" expanded="true" signature="369:511" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="61" column="69" lean-forward="true" selection-start-line="61" selection-start-column="69" selection-end-line="61" selection-end-column="69" />
+          <folding>
+            <marker date="1565441324049" expanded="true" signature="6:44" ph="..." />
+            <marker date="1565441324049" expanded="true" signature="89:2798" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="102:293" ph="..." />
+            <marker date="1565441324049" expanded="true" signature="342:2796" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="472:538" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="971:1046" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="1158:1266" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="1401:1618" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="1697:2790" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="1973:2743" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="2262:2729" ph="{...}" />
+            <marker date="1565441324049" expanded="true" signature="2395:2709" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="136">
-          <caret line="8" column="47" lean-forward="true" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
-          <folding>
-            <marker date="1565433338777" expanded="true" signature="6:31" ph="..." />
-            <marker date="1565433338777" expanded="true" signature="52:6108" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="65:256" ph="..." />
-            <marker date="1565433338777" expanded="true" signature="439:6106" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="454:659" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
-            <marker date="1565433338777" expanded="true" signature="737:812" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="824:1053" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
-            <marker date="1565433338777" expanded="true" signature="1117:3807" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="1160:3748" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="3817:4287" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
-            <marker date="1565433338777" expanded="true" signature="4488:5416" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="4629:4758" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="4789:4848" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="4894:5129" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="5017:5115" ph="{...}" />
-            <marker date="1565433338777" expanded="true" signature="5426:5877" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
-            <marker date="1565433338777" expanded="true" signature="6039:6096" ph="{...}" />
+          <caret line="38" column="67" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="67" />
+          <folding>
+            <marker date="1565441420957" expanded="true" signature="76:2003" ph="{...}" />
+            <marker date="1565441420957" expanded="false" signature="89:244" ph="..." />
+            <marker date="1565441420957" expanded="true" signature="295:2001" ph="{...}" />
+            <marker date="1565441420957" expanded="true" signature="535:620" ph="{...}" />
+            <marker date="1565441420957" expanded="true" signature="732:850" ph="{...}" />
+            <marker date="1565441420957" expanded="true" signature="984:1211" ph="{...}" />
+            <marker date="1565441420957" expanded="true" signature="1304:1995" ph="{...}" />
+            <marker date="1565441420957" expanded="true" signature="1767:1983" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
+          <folding>
+            <marker date="1565441391697" expanded="true" signature="6:56" ph="..." />
+            <marker date="1565441391697" expanded="true" signature="103:847" ph="{...}" />
+            <marker date="1565441391697" expanded="true" signature="116:224" ph="..." />
+            <marker date="1565441391697" expanded="true" signature="344:845" ph="{...}" />
+            <marker date="1565441391697" expanded="true" signature="404:839" ph="{...}" />
+            <marker date="1565441391697" expanded="true" signature="651:827" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1799">
+          <caret line="110" column="100" lean-forward="true" selection-start-line="110" selection-start-column="100" selection-end-line="110" selection-end-column="100" />
+          <folding>
+            <marker date="1565441516548" expanded="true" signature="73:7220" ph="{...}" />
+            <marker date="1565441516548" expanded="false" signature="86:191" ph="..." />
+            <marker date="1565441516548" expanded="true" signature="197:277" ph="/// the core relation mapping functionality ... " />
+            <marker date="1565441516548" expanded="true" signature="319:7218" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="334:841" ph="/// Get all related id for the supplied criteria ... " />
+            <marker date="1565441516548" expanded="true" signature="979:2983" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="1101:2928" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="1279:2914" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="1886:2204" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="2229:2793" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="2555:2771" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="2993:3484" ph="/// ... " />
+            <marker date="1565441516548" expanded="true" signature="3635:7212" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="3801:7202" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="4382:4702" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="4723:5282" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="5051:5264" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="5534:6850" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="5652:6832" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="5945:6810" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="6134:6515" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="6971:7188" ph="{...}" />
+            <marker date="1565441516548" expanded="true" signature="7051:7170" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="22" column="9" lean-forward="true" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
+          <folding>
+            <marker date="1565441522112" expanded="true" signature="42:1087" ph="{...}" />
+            <marker date="1565441522112" expanded="false" signature="55:190" ph="..." />
+            <marker date="1565441522112" expanded="true" signature="307:1085" ph="{...}" />
+            <marker date="1565441522112" expanded="true" signature="385:761" ph="{...}" />
+            <marker date="1565441522112" expanded="true" signature="573:749" ph="{...}" />
+            <marker date="1565441522112" expanded="true" signature="949:1079" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-340">
+          <caret line="63" column="13" lean-forward="true" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
+          <folding>
+            <marker date="1565441597254" expanded="true" signature="73:4920" ph="{...}" />
+            <marker date="1565441597254" expanded="false" signature="86:198" ph="..." />
+            <marker date="1565441597254" expanded="true" signature="204:306" ph="/// Represents the data stored in the comment field of a relation ... " />
+            <marker date="1565441597254" expanded="true" signature="346:4918" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="361:458" ph="/// The property alias of the picker using relations ... " />
+            <marker date="1565441597254" expanded="true" signature="526:620" ph="/// Used to identify a specific dataType instance ... " />
+            <marker date="1565441597254" expanded="true" signature="686:762" ph="/// Used to identify a dataType ... " />
+            <marker date="1565441597254" expanded="true" signature="834:1129" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
+            <marker date="1565441597254" expanded="true" signature="1206:2767" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="1518:1657" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="1674:2309" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="1802:1951" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="1972:2295" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="2115:2277" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="2348:2552" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="2569:2757" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="2777:2977" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
+            <marker date="1565441597254" expanded="true" signature="3033:3871" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="3096:3861" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="3130:3636" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="3675:3847" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="3881:4071" ph="/// Helper to determine if the property is inside an Archetype ... " />
+            <marker date="1565441597254" expanded="true" signature="4109:4201" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="4271:4499" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="4297:4413" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="4444:4489" ph="{...}" />
+            <marker date="1565441597254" expanded="true" signature="4509:4639" ph="/// Get the serialized XML comment ... " />
+            <marker date="1565441597254" expanded="true" signature="4676:4911" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
+          <folding>
+            <marker date="1565435225174" expanded="true" signature="30:83" ph="{...}" />
+            <marker date="1565435225174" expanded="true" signature="68:81" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="19" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="499">
+          <caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
+          <folding>
+            <marker date="1565435304332" expanded="true" signature="6:181" ph="..." />
+            <marker date="1565435304332" expanded="true" signature="213:1510" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="307:1508" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="441:500" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="532:601" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="720:1400" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="1023:1156" ph="{...}" />
+            <marker date="1565435304332" expanded="true" signature="1433:1502" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="56" column="68" lean-forward="true" selection-start-line="56" selection-start-column="68" selection-end-line="56" selection-end-column="95" />
+          <folding>
+            <marker date="1565441918806" expanded="false" signature="6:208" ph="..." />
+            <marker date="1565441918806" expanded="true" signature="240:2364" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="334:2362" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="545:659" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="690:759" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="878:1163" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="1196:1265" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="1359:1539" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="1637:1819" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="1916:2085" ph="{...}" />
+            <marker date="1565441918806" expanded="true" signature="2186:2356" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1530">
+          <caret line="90" column="69" lean-forward="true" selection-start-line="90" selection-start-column="69" selection-end-line="90" selection-end-column="69" />
+          <folding>
+            <marker date="1565441879547" expanded="true" signature="6:361" ph="..." />
+            <marker date="1565441879547" expanded="true" signature="393:5226" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="437:5224" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="648:762" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="793:862" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="981:1184" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="1217:1286" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="1379:1458" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="1546:1625" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="1716:1795" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="1805:1988" ph="/// combined event for content / media / member ... " />
+            <marker date="1565441879547" expanded="true" signature="2073:5218" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="2147:5208" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="2368:5194" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="3027:5176" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="3214:4639" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="3299:3429" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="3462:4613" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="3952:4121" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="4187:4352" ph="{...}" />
+            <marker date="1565441879547" expanded="true" signature="4419:4583" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="61" lean-forward="true" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
+          <folding>
+            <marker date="1565441897395" expanded="true" signature="6:77" ph="..." />
+            <marker date="1565441897395" expanded="true" signature="98:550" ph="{...}" />
+            <marker date="1565441897395" expanded="true" signature="200:548" ph="{...}" />
+            <marker date="1565441897395" expanded="true" signature="259:542" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-102">
+          <caret line="96" column="81" selection-start-line="96" selection-start-column="81" selection-end-line="96" selection-end-column="81" />
+          <folding>
+            <marker date="1565440742160" expanded="true" signature="8:216" ph="..." />
+            <marker date="1565440742160" expanded="true" signature="255:5216" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="268:348" ph="..." />
+            <marker date="1565440742160" expanded="true" signature="354:477" ph="/// This class exists so as to be able to save xml direclty into the Umbraco xml cache ... " />
+            <marker date="1565440742160" expanded="true" signature="544:5214" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="590:758" ph="/// reconstruct values from original (default) property value editor ... " />
+            <marker date="1565440742160" expanded="true" signature="853:1044" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="1118:1235" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="1245:1573" ph="/// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData ... " />
+            <marker date="1565440742160" expanded="true" signature="1698:1989" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="1817:1891" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="1922:1979" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="2088:3221" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="2307:2558" ph="/* mandatory and regex validators cannot be part of valueEditor.Validators because they ... */" />
+            <marker date="1565440742160" expanded="true" signature="2585:2789" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="2934:3142" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="3231:3331" ph="/// A collection of validators for the pre value editor ... " />
+            <marker date="1565440742160" expanded="true" signature="3448:3577" ph="/// Gets the validator used to validate the special property type -level &quot;required&quot;. ... " />
+            <marker date="1565440742160" expanded="true" signature="3672:3799" ph="/// Gets the validator used to validate the special property type -level &quot;format&quot;. ... " />
+            <marker date="1565440742160" expanded="true" signature="3973:4049" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="4180:4256" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="4432:4508" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="4620:4696" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="4812:4888" ph="{...}" />
+            <marker date="1565440742160" expanded="true" signature="4975:5083" ph="{...}" />
           </folding>
         </state>
       </provider>
diff --git a/source/nuPickers.Tests/nuPickers.Tests.csproj b/source/nuPickers.Tests/nuPickers.Tests.csproj
index 5c43fb7..e460410 100644
--- a/source/nuPickers.Tests/nuPickers.Tests.csproj
+++ b/source/nuPickers.Tests/nuPickers.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -35,6 +36,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -61,6 +66,9 @@
       <Name>nuPickers</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -81,6 +89,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/nuPickers.Tests/packages.config b/source/nuPickers.Tests/packages.config
new file mode 100644
index 0000000..4157381
--- /dev/null
+++ b/source/nuPickers.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/source/nuPickers/Compontents/CacheInvalidationCompontent.cs b/source/nuPickers/Components/CacheInvalidationComponent.cs
similarity index 90%
rename from source/nuPickers/Compontents/CacheInvalidationCompontent.cs
rename to source/nuPickers/Components/CacheInvalidationComponent.cs
index 6978eb1..68cbd8c 100644
--- a/source/nuPickers/Compontents/CacheInvalidationCompontent.cs
+++ b/source/nuPickers/Components/CacheInvalidationComponent.cs
@@ -7,14 +7,14 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace nuPickers.Compontents
+namespace nuPickers.Components
 {
-    public class CacheInvalidationCompontent : IComponent, Umbraco.Core.Composing.IComponent
+    public class CacheInvalidationComponent : IComponent, Umbraco.Core.Composing.IComponent
     {
         private ContentService _contentService;
         private DataTypeService _dataTypeService;
 
-        public CacheInvalidationCompontent(ContentService contentService, DataTypeService dataTypeService)
+        public CacheInvalidationComponent(ContentService contentService, DataTypeService dataTypeService)
         {
             _contentService = contentService;
             _dataTypeService = dataTypeService;
diff --git a/source/nuPickers/Compontents/EmbeddedResourceCompontent.cs b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
similarity index 60%
rename from source/nuPickers/Compontents/EmbeddedResourceCompontent.cs
rename to source/nuPickers/Components/EmbeddedResourceCompontent.cs
index b72afeb..d6f88c8 100644
--- a/source/nuPickers/Compontents/EmbeddedResourceCompontent.cs
+++ b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
@@ -4,11 +4,20 @@
 using System.Web.Routing;
 using ClientDependency.Core;
 using nuPickers.EmbeddedResource;
+using Umbraco.Core.Logging;
 
-namespace nuPickers.Compontents
+namespace nuPickers.Components
 {
     public class EmbeddedResourceCompontent : IComponent, Umbraco.Core.Composing.IComponent
     {
+        private readonly IProfilingLogger _logger;
+
+        public EmbeddedResourceCompontent(IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
+
         public void Dispose()
         {
             throw new NotImplementedException();
@@ -16,22 +25,23 @@ public void Dispose()
 
         public ISite Site { get; set; }
         public event EventHandler Disposed;
+
         public void Initialize()
         {
-
             RouteTable
                 .Routes
                 .MapRoute(
                     name: "nuPickersShared",
-                    url:  EmbeddedResource.ROOT_URL.TrimStart("~/") + "{folder}/{file}",
+                    url: EmbeddedResource.EmbeddedResource.ROOT_URL.TrimStart("~/".ToCharArray()) + "{folder}/{file}",
                     defaults: new
                     {
                         controller = "EmbeddedResource",
                         action = "GetSharedResource"
                     },
-                    namespaces: new[] { "nuPickers.EmbeddedResource" });
+                    namespaces: new[] {"nuPickers.EmbeddedResource"});
 
-            FileWriters.AddWriterForExtension(EmbeddedResource.FILE_EXTENSION, new EmbeddedResourceVirtualFileWriter());
+            FileWriters.AddWriterForExtension(EmbeddedResource.EmbeddedResource.FILE_EXTENSION,
+                new EmbeddedResourceVirtualFileWriter(_logger));
         }
 
         public void Terminate()
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs b/source/nuPickers/Components/RelationMappingComponent.cs
similarity index 66%
rename from source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs
rename to source/nuPickers/Components/RelationMappingComponent.cs
index 0f89801..213be1e 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs
+++ b/source/nuPickers/Components/RelationMappingComponent.cs
@@ -1,28 +1,50 @@
-namespace nuPickers.Shared.RelationMapping
-{
-    using nuPickers.Shared.SaveFormat;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Umbraco.Core;
-    using Umbraco.Core.Events;
-    using Umbraco.Core.Models;
-    using Umbraco.Core.Services;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using nuPickers.Caching;
+using nuPickers.Shared.RelationMapping;
+using nuPickers.Shared.SaveFormat;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 
-    /// <summary>
-    /// server side event to update relations on change of any content / media / member using a nuPicker with relation mapping
-    /// </summary>
-    public class RelationMappingEvent : ApplicationEventHandler
+namespace nuPickers.Components
+{
+    public class RelationMappingComponent
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+          private ContentService _contentService;
+        private DataTypeService _dataTypeService;
+
+        public RelationMappingComponent(ContentService contentService, DataTypeService dataTypeService)
+        {
+            _contentService = contentService;
+            _dataTypeService = dataTypeService;
+        }
+
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
         {
             ContentService.Saved += this.ContentService_Saved;
             MediaService.Saved += this.MediaService_Saved;
             MemberService.Saved += this.MemberService_Saved;
-            
-            // NOTE: all relations to an id are automatically deleted when emptying the recycle bin
         }
 
-        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
+        public void Terminate()
+        {
+            throw new NotImplementedException();
+        }
+
+       private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
         {
             this.Saved((IService)sender, e.SavedEntities);
         }
@@ -38,7 +60,7 @@ private void MemberService_Saved(IMemberService sender, SaveEventArgs<IMember> e
         }
 
         /// <summary>
-        /// combined event for content / media / member 
+        /// combined event for content / media / member
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="savedEntities"></param>
@@ -47,22 +69,22 @@ private void Saved(IService sender, IEnumerable<IContentBase> savedEntities)
             foreach (IContentBase savedEntity in savedEntities)
             {
                 // for each property
-                foreach (PropertyType propertyType in savedEntity.PropertyTypes.Where(x => PickerPropertyValueConverter.IsPicker(x.PropertyEditorAlias)))
+                foreach (IPublishedProperty propertyType in savedEntity.Properties.Where(x => PickerPropertyValueConverter.IsPicker(x.PropertyType.PropertyEditorAlias)))
                 {
                     // create picker supplying all values
                     Picker picker = new Picker(
-                                            savedEntity.Id, 
+                                            savedEntity.Id,
                                             savedEntity.ParentId,
-                                            propertyType.Alias, 
-                                            propertyType.DataTypeDefinitionId, 
-                                            propertyType.PropertyEditorAlias,
+                                            propertyType.PropertyType.Alias,
+                                            propertyType.PropertyType.DataType.Id,
+                                            propertyType.PropertyType.EditorAlias,
                                             savedEntity.GetValue(propertyType.Alias));
 
                     if (!string.IsNullOrWhiteSpace(picker.RelationTypeAlias))
                     {
-                        bool isRelationsOnly = picker.GetDataTypePreValue("saveFormat").Value == "relationsOnly";
+                        bool isRelationsOnly = picker.GetDataTypePreValue("saveFormat").ToString() == "relationsOnly";
 
-                        if (isRelationsOnly) 
+                        if (isRelationsOnly)
                         {
                             if (picker.SavedValue == null)
                             {
@@ -90,7 +112,7 @@ private void Saved(IService sender, IEnumerable<IContentBase> savedEntities)
                                 }
                             }
                         }
-                       
+
                         // update database
                         RelationMapping.UpdateRelationMapping(
                                                 picker.ContextId,           // savedEntity.Id
diff --git a/source/nuPickers/Compontents/nuPickerCompontent.cs b/source/nuPickers/Components/nuPickerCompontent.cs
similarity index 55%
rename from source/nuPickers/Compontents/nuPickerCompontent.cs
rename to source/nuPickers/Components/nuPickerCompontent.cs
index dcafcce..2d0956c 100644
--- a/source/nuPickers/Compontents/nuPickerCompontent.cs
+++ b/source/nuPickers/Components/nuPickerCompontent.cs
@@ -1,7 +1,7 @@
-namespace nuPickers.Compontents
+namespace nuPickers.Components
 {
     public class nuPickerCompontent
     {
-        
+
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs b/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
index 010121e..b8fb980 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
@@ -13,6 +13,12 @@
     /// </summary>
     public sealed class EmbeddedResourceVirtualFileWriter : IVirtualFileWriter
     {
+        private readonly IProfilingLogger _logger;
+        public EmbeddedResourceVirtualFileWriter(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
         public bool WriteToStream(BaseCompositeFileProcessingProvider provider, StreamWriter sw, IVirtualFile vf, ClientDependencyType type, string origUrl, HttpContextBase http)
         {
             try
@@ -27,7 +33,7 @@ public bool WriteToStream(BaseCompositeFileProcessingProvider provider, StreamWr
             }
             catch (Exception exception)
             {
-                LogHelper.Warn(typeof(EmbeddedResourceVirtualFileWriter), exception.Message);
+                _logger.Info<EmbeddedResourceVirtualFileWriter>(exception.Message);
 
                 return false;
             }
diff --git a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
index 748d670..35c40ff 100644
--- a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
+++ b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace nuPickers.Extensions
 {
@@ -16,16 +17,15 @@ internal static class IEnumerableStringExtensions
         /// </summary>
         /// <param name="keys"></param>
         /// <returns>a collection (populated, or empty)</returns>
-        internal static IEnumerable<IPublishedContent> AsPublishedContent(this IEnumerable<string> keys, IUmbracoContextFactory contextFactory)
+        internal static IEnumerable<IPublishedContent> AsPublishedContent(this IEnumerable<string> keys)
         {
 
-            using (var cf = contextFactory.EnsureUmbracoContext())
-            {
-                var cache = cf.UmbracoContext.ContentCache;
+
+
                 return keys
-                    .Select(x =>  cache.GetByRoute(x))
+                    .Select(x =>  Current.UmbracoHelper.Content(x))
                     .Where(x => x != null);
-            }
+
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Picker.cs b/source/nuPickers/Picker.cs
index 2e41966..b9dca5c 100644
--- a/source/nuPickers/Picker.cs
+++ b/source/nuPickers/Picker.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Composing;
+using Umbraco.Web.Composing;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace nuPickers
@@ -42,7 +42,7 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
         {
             bool success = false;
 
-            var publishedContent = new UmbracoHelper(UmbracoContext.Current).GetPublishedContent(contextId);
+            var publishedContent = Current.UmbracoHelper.Content(contextId);
 
             if (usePublishedValue && publishedContent != null)
             {
@@ -53,7 +53,7 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
                     var propertyType = publishedContent.ContentType.PropertyTypes.Single(x => x.Alias == property.Alias);
 
                     this.ContextId = publishedContent.Id;
-                    this.ParentId = (publishedContent.Parent != null) ? publishedContent.Parent.Id : -1;
+                    this.ParentId = publishedContent.Parent?.Id ?? -1;
                     this.PropertyAlias = propertyAlias;
                     this.DataTypeId = propertyType.DataType.Id;
                     this.PropertyEditorAlias = propertyType.EditorAlias;
@@ -130,7 +130,7 @@ public IEnumerable<string> PickedKeys
             {
                 if (this.pickedKeys == null)
                 {
-                    if (this.GetDataTypePreValue("saveFormat").Value == "relationsOnly")
+                    if (this.GetDataTypePreValue("saveFormat").ToString() == "relationsOnly")
                     {
                         // attempt to find relations data in memory cache
                         this.pickedKeys = Cache.Instance.GetSet(CacheConstants.PickedKeysPrefix + this.ContextId.ToString() + "_" + this.PropertyAlias, () =>
@@ -179,11 +179,11 @@ internal string RelationTypeAlias
             get
             {
                 // not all pickers support relation mapping, so null check required
-                PreValue relationMappingPreValue = this.GetDataTypePreValue("relationMapping");
-                if (relationMappingPreValue != null && !string.IsNullOrWhiteSpace(relationMappingPreValue.Value))
+                object relationMappingPreValue = this.GetDataTypePreValue("relationMapping");
+                if (relationMappingPreValue != null && !string.IsNullOrWhiteSpace(relationMappingPreValue.ToString()))
                 {
                     // parse the json config to get a relationType alias
-                    return JObject.Parse(relationMappingPreValue.Value).GetValue("relationTypeAlias").ToString();
+                    return JObject.Parse(relationMappingPreValue.ToString()).GetValue("relationTypeAlias").ToString();
                 }
 
                 return null;
@@ -223,15 +223,10 @@ private IDictionary<string, object> DataTypePreValues
         {
             get
             {
-                return Cache.Instance.GetSet(CacheConstants.DataTypePreValuesPrefix + this.DataTypeId, () =>
-                {
-                    return  ApplicationContext
-                                .Current
-                                .Services
-                                .DataTypeService
-                                .GetPreValuesCollectionByDataTypeId(this.DataTypeId)
-                                .PreValuesAsDictionary;
-                });
+                return Cache.Instance.GetSet(CacheConstants.DataTypePreValuesPrefix + DataTypeId, () =>
+                    {
+                        return Current.Services.DataTypeService.GetDataType(DataTypeId).Editor.DefaultConfiguration;
+                    });
             }
         }
 
@@ -316,7 +311,7 @@ public IEnumerable<IPublishedContent> AsPublishedContent()
         //[Obsolete("[v2.0.0]")]
         public IEnumerable<dynamic> AsDynamicPublishedContent()
         {
-            return this.AsPublishedContent().Select(x => x.AsDynamic());
+            return this.AsPublishedContent();
         }
 
         /// <summary>
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index 2009c4c..57e10fb 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Web;
+using Umbraco.Web.Composing;
 
 namespace nuPickers
 {
@@ -10,10 +11,12 @@ namespace nuPickers
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web;
 
-    [PropertyType(typeof(Picker))]
-    [PropertyCache(PropertyCacheValue.All, PropertyCacheLevel.Element)]
     public class PickerPropertyValueConverter : PropertyValueConverterBase
     {
+        public PickerPropertyValueConverter()
+        {
+        }
+
         /// <summary>
         /// This is a generic converter for all nuPicker Picker PropertyEditors
         /// </summary>
@@ -89,7 +92,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
 
             try
             {
-                assignedContentItem = new UmbracoHelper(UmbracoContext.Current).AssignedContentItem;
+                assignedContentItem = Current.UmbracoHelper.AssignedContentItem;
             }
             catch
             {
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
index 5fe72c2..d99e32a 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
@@ -3,7 +3,7 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class DotNetCheckBoxPickerPreValueEditor : PreValueEditor
+    internal class DotNetCheckBoxPickerPreValueEditor : IConfigurationEditor
     {
         [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
index d70281a..d000977 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
+using Umbraco.Core.Models;
+
+namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
     using nuPickers.PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
-    
+
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyType(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs b/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
index 075b279..f388c99 100644
--- a/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
+++ b/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
@@ -11,6 +11,11 @@
 
     public class DotNetDataSource : IDataSource
     {
+        private readonly IProfilingLogger _logger;
+        public DotNetDataSource(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
         private bool handledTypeahead = false;
 
         public string AssemblyName { get; set; }
@@ -136,7 +141,8 @@ private void SetProperties(ref IDotNetDataSource dotNetDataSource, int contextId
                 }
                 else
                 {
-                    LogHelper.Warn(typeof(DotNetDataSource), "Unexpected PropertyType, " + propertyInfo.Name + " is not a string");
+                    _logger.Info<DotNetDataSource>(  "Unexpected PropertyType, {PropertyName} is not a string)",propertyInfo.Name );
+
                 }
             }
         }
diff --git a/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs b/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
index 86ab297..3a51d0f 100644
--- a/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
+++ b/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
@@ -11,6 +11,12 @@
 
     public class JsonDataSource : IDataSource
     {
+        private readonly IProfilingLogger _logger;
+        public JsonDataSource(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
         public string Url { get; set; }
 
         public string JsonPath { get; set; }
@@ -44,7 +50,7 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
         /// Main method for retrieving nuPicker data items.
         /// </summary>
         /// <param name="contextId">Current context node Id</param>
-        /// <returns>List of items for displaying inside a nuPicker JSON data type.</returns>        
+        /// <returns>List of items for displaying inside a nuPicker JSON data type.</returns>
         private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>(); // prepare return value
@@ -54,12 +60,13 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
             JToken jToken = null; // object representation of all json source data
 
             try
-            {                
+            {
                 jToken = JToken.Parse(Helper.GetDataFromUrl(url));
             }
             catch (JsonException jsonException)
             {
-                LogHelper.Warn(typeof(JsonDataSource), jsonException.Message + " (Check JSON at Url: " + url + ")");
+                _logger.Info<JsonDataSource>(  "{Message} (Check JSON at Url: {URL})",jsonException.Message, url  );
+
             }
 
             if (jToken != null)
@@ -85,7 +92,8 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
                     }
                     catch (JsonException jsonException)
                     {
-                        LogHelper.Warn(typeof(JsonDataSource), jsonException.Message + " (Check JSONPath: " + this.JsonPath + ")");
+                        _logger.Info<JsonDataSource>(  "{Message} (Check JSONPath: {JsonPath})",jsonException.Message, JsonPath  );
+
                     }
 
                     if (jTokens != null)
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
index c85ce93..e6e3219 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
@@ -1,9 +1,11 @@
-namespace nuPickers.Shared.LuceneDataSource
+using Examine.Search;
+using Umbraco.Examine;
+
+namespace nuPickers.Shared.LuceneDataSource
 {
     using DataSource;
     using Examine;
     using Examine.Providers;
-    using Examine.SearchCriteria;
     using nuPickers.Shared.Editor;
     using Paging;
     using System;
@@ -12,12 +14,20 @@
 
     public class LuceneDataSource : IDataSource
     {
+
+        private readonly IExamineManager _examineManager;
+
+        public LuceneDataSource(IExamineManager examineManager)
+        {
+            _examineManager = examineManager;
+        }
+
         public string ExamineSearcher { get; set; }
 
         public string RawQuery { get; set; }
-        
+
         public string KeyField { get; set; }
-        
+
         public string LabelField { get; set; }
 
         bool IDataSource.HandledTypeahead { get { return false; } } // TODO: Implement token replacement for Lucene queries
@@ -45,20 +55,21 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
 
-            BaseSearchProvider searchProvider = ExamineManager.Instance.SearchProviderCollection[this.ExamineSearcher];
+            ISearcher searchProvider = _examineManager.TryGetIndex(ExamineSearcher, out var externalIndex) ? externalIndex.GetSearcher() : null;
 
             if (searchProvider != null)
             {
-                ISearchCriteria searchCriteria = searchProvider.CreateSearchCriteria().RawQuery(this.RawQuery);
-                ISearchResults searchResults = searchProvider.Search(searchCriteria);
+                IQuery searchCriteria = searchProvider.CreateQuery();
+                var query = searchCriteria.NativeQuery(this.RawQuery);
+                ISearchResults searchResults = query.Execute();
 
                 foreach (SearchResult searchResult in searchResults)
                 {
                     editorDataItems.Add(
-                        new EditorDataItem() 
-                            { 
-                                Key = searchResult.Fields.ContainsKey(this.KeyField) ? searchResult.Fields[this.KeyField] : null,
-                                Label = searchResult.Fields.ContainsKey(this.LabelField) ? searchResult.Fields[this.LabelField] : null
+                        new EditorDataItem()
+                            {
+                                Key = searchResult.AllValues.ContainsKey(this.KeyField) ? searchResult.AllValues[this.KeyField][0] : null,
+                                Label = searchResult.AllValues.ContainsKey(this.LabelField) ? searchResult.AllValues[this.LabelField][0] : null
                             });
                 }
             }
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
index 875271f..0de111a 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
@@ -1,17 +1,18 @@
-namespace nuPickers.Shared.LuceneDataSource
+using Umbraco.Examine;
+
+namespace nuPickers.Shared.LuceneDataSource
 {
     using System.Collections.Generic;
     using System.Linq;
     using Umbraco.Web.Editors;
     using Umbraco.Web.Mvc;
-    using UmbracoExamine;
 
     [PluginController("nuPickers")]
     public class LuceneDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetExamineSearchers()
         {
-            return Examine.ExamineManager.Instance.SearchProviderCollection.OfType<UmbracoExamineSearcher>().Select(x => x.Name);            
+            return Examine.ExamineManager.Instance.RegisteredSearchers.OfType<UmbracoExamineIndex>().Select(x => x.Name);
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
index 48942da..db06e6c 100644
--- a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
+++ b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.RelationDataSource
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationDataSource
 {
     using DataSource;
     using Editor;
@@ -34,7 +36,7 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
 
         private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId)
         {
-            var relationService = ApplicationContext.Current.Services.RelationService;
+            var relationService = Current.Services.RelationService;
 
             return relationService.GetEntitiesFromRelations(
                                                 relationService.GetByRelationTypeAlias(this.RelationType)
diff --git a/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs b/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
index 6ce8d3c..16ce603 100644
--- a/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
+++ b/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
@@ -1,8 +1,10 @@
-namespace nuPickers.Shared.RelationDataSource
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models;
+
+namespace nuPickers.Shared.RelationDataSource
 {
     using System.Collections.Generic;
     using System.Linq;
-    using umbraco.cms.businesslogic.relation;
     using Umbraco.Web.Editors;
     using Umbraco.Web.Mvc;
 
@@ -11,13 +13,14 @@ public class RelationDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetRelationTypes()
         {
-            return RelationType.GetAll()
+            var relationService = Current.Services.RelationService;
+            return relationService.GetAllRelationTypes()
                         .OrderBy(x => x.Name)
                         .Select(x => new
                         {
                             key = x.Alias,
                             label = x.Name,
-                            biDirectional = x.Dual
+                            biDirectional = x.IsBidirectional
                         });
         }
     }
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
index 8ae7cc5..46981c2 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.RelationMapping
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationMapping
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -22,12 +24,12 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         {
             if (contextId != 0) // new content / media / members don't have an id (so can't have any relations)
             {
-                IRelationType relationType = ApplicationContext.Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
+                IRelationType relationType = Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
 
                 if (relationType != null)
                 {
                     // get all relations of this type
-                    IEnumerable<IRelation> relations = ApplicationContext.Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id);
+                    IEnumerable<IRelation> relations = Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id);
 
                     // construct object used to identify a relation (this is serialized into the relation comment field)
                     RelationMappingComment relationMappingComment = new RelationMappingComment(contextId, propertyAlias);
@@ -57,7 +59,7 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="contextId">the id of the content, media or member item</param>
         /// <param name="propertyAlias">the property alias of the picker using relation mapping</param>
@@ -66,12 +68,12 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         /// <param name="pickedIds">the ids of all picked items that are to be related to the contextId</param>
         internal static void UpdateRelationMapping(int contextId, string propertyAlias, string relationTypeAlias, bool relationsOnly, int[] pickedIds)
         {
-            IRelationType relationType = ApplicationContext.Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
+            IRelationType relationType = Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
 
             if (relationType != null)
             {
                 // get all relations of this type
-                List<IRelation> relations = ApplicationContext.Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id).ToList();
+                List<IRelation> relations = Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id).ToList();
 
                 // construct object used to identify a relation (this is serialized into the relation comment field)
                 RelationMappingComment relationMappingComment = new RelationMappingComment(contextId, propertyAlias);
@@ -94,13 +96,13 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                 }
 
                 // check current context is of the correct object type (as according to the relation type)
-                if (ApplicationContext.Current.Services.EntityService.GetObjectType(contextId) == UmbracoObjectTypesExtensions.GetUmbracoObjectType(relationType.ChildObjectType))
+                if (Current.Services.EntityService.GetObjectType(contextId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ChildObjectType))
                 {
-                    // for each picked item 
+                    // for each picked item
                     foreach (int pickedId in pickedIds)
                     {
                         // check picked item context if of the correct object type (as according to the relation type)
-                        if (ApplicationContext.Current.Services.EntityService.GetObjectType(pickedId) == UmbracoObjectTypesExtensions.GetUmbracoObjectType(relationType.ParentObjectType))
+                        if (Current.Services.EntityService.GetObjectType(pickedId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ParentObjectType))
                         {
                             // if relation doesn't already exist (new picked item)
                             if (!relations.Exists(x => x.ParentId == pickedId))
@@ -108,7 +110,7 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                                 // create relation
                                 Relation relation = new Relation(pickedId, contextId, relationType);
                                 relation.Comment = relationMappingComment.GetComment();
-                                ApplicationContext.Current.Services.RelationService.Save(relation);
+                                Current.Services.RelationService.Save(relation);
                             }
 
                             // housekeeping - remove 'the' relation from the list being processed (there should be only one)
@@ -122,7 +124,7 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                 {
                     foreach (IRelation relation in relations)
                     {
-                        ApplicationContext.Current.Services.RelationService.Delete(relation);
+                        Current.Services.RelationService.Delete(relation);
                     }
                 }
             }
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs b/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
index fab7b28..6daabba 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
@@ -12,7 +12,7 @@ public class RelationMappingApiController : UmbracoAuthorizedJsonController
         [HttpGet]
         public IEnumerable<object> GetRelationTypes()
         {
-            return ApplicationContext.Services.RelationService.GetAllRelationTypes()
+            return Services.RelationService.GetAllRelationTypes()
                         .OrderBy(x => x.Name)
                         .Select(x => new
                         {
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs b/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
index d2c9c77..1fbd3aa 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.RelationMapping
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationMapping
 {
     using System;
     using System.Linq;
@@ -36,27 +38,27 @@ internal RelationMappingComment(int contextId, string propertyAlias)
             PropertyType propertyType = null;
 
             // is there a better way of getting the property types for an id without having to check content / media / members independently ?
-            var content = ApplicationContext.Current.Services.ContentService.GetById(contextId);
+            var content = Current.Services.ContentService.GetById(contextId);
 
             if (content != null)
             {
-                propertyType = content.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                propertyType = content.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
             }
             else
             {
-                var media = ApplicationContext.Current.Services.MediaService.GetById(contextId);
+                var media = Current.Services.MediaService.GetById(contextId);
 
                 if (media != null)
                 {
-                    propertyType = media.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                    propertyType = media.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
                 }
                 else
                 {
-                    var member = ApplicationContext.Current.Services.MemberService.GetById(contextId);
+                    var member = Current.Services.MemberService.GetById(contextId);
 
                     if (member != null)
                     {
-                        propertyType = member.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                        propertyType = member.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
                     }
                 }
             }
@@ -65,7 +67,7 @@ internal RelationMappingComment(int contextId, string propertyAlias)
             {
                 this.PropertyAlias = propertyAlias;
                 this.PropertyTypeId = propertyType.Id;
-                this.DataTypeDefinitionId = propertyType.DataTypeDefinitionId;
+                this.DataTypeDefinitionId = propertyType.DataTypeId;
             }
             else
             {
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
index 4a01a87..da1e8e1 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
@@ -1,28 +1,41 @@
-namespace nuPickers.Shared.SaveFormat
+
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.SaveFormat
 {
     using System.Xml.Linq;
     using Umbraco.Core.Models;
-    using Umbraco.Core.PropertyEditors;
     using Umbraco.Core.Services;
 
     /// <summary>
     /// This class exists so as to be able to save xml direclty into the Umbraco xml cache
     /// </summary>
-    public class SaveFormatPropertyValueEditor : PropertyValueEditor
+    public class SaveFormatPropertyValueEditor  : IDataValueEditor
     {
+        private string _view;
+
         /// <summary>
         /// reconstruct values from original (default) property value editor
         /// </summary>
         /// <param name="propertyValueEditor"></param>
-        public SaveFormatPropertyValueEditor(PropertyValueEditor propertyValueEditor)
+        public SaveFormatPropertyValueEditor(DataEditorAttribute propertyValueEditor) : this()
         {
             this.HideLabel = propertyValueEditor.HideLabel;
             this.View = propertyValueEditor.View;
             this.ValueType = propertyValueEditor.ValueType;
-            foreach (IPropertyValidator propertyValidator in propertyValueEditor.Validators)
-            {
-                this.Validators.Add(propertyValidator);
-            }
+
+        }
+        public SaveFormatPropertyValueEditor() // for tests, and manifest
+        {
+            ValueType = ValueTypes.String;
+            Validators = new List<IValueValidator>();
         }
 
         /// <summary>
@@ -45,5 +58,83 @@ public override XNode ConvertDbToXml(Property property, PropertyType propertyTyp
                 return new XCData(value);
             }
         }
+
+        public IEnumerable<ValidationResult> Validate(object value, bool required, string format)
+        {
+            List<ValidationResult> results = null;
+            var r = Validators.SelectMany(v => v.Validate(value, ValueType, Configuration)).ToList();
+            if (r.Any()) { results = r; }
+
+            // mandatory and regex validators cannot be part of valueEditor.Validators because they
+            // depend on values that are not part of the configuration, .Mandatory and .ValidationRegEx,
+            // so they have to be explicitly invoked here.
+
+            if (required)
+            {
+                r = RequiredValidator.ValidateRequired(value, ValueType).ToList();
+                if (r.Any()) { if (results == null) results = r; else results.AddRange(r); }
+            }
+
+            var stringValue = value?.ToString();
+            if (!string.IsNullOrWhiteSpace(format) && !string.IsNullOrWhiteSpace(stringValue))
+            {
+                r = FormatValidator.ValidateFormat(value, ValueType, format).ToList();
+                if (r.Any()) { if (results == null) results = r; else results.AddRange(r); }
+            }
+
+            return results ?? Enumerable.Empty<ValidationResult>();
+        }
+
+        /// <summary>
+        /// A collection of validators for the pre value editor
+        /// </summary>
+        [JsonProperty("validation")]
+        public List<IValueValidator> Validators { get; private set; }
+
+        /// <summary>
+        /// Gets the validator used to validate the special property type -level "required".
+        /// </summary>
+        public virtual IValueRequiredValidator RequiredValidator => new Requiredv();
+
+        /// <summary>
+        /// Gets the validator used to validate the special property type -level "format".
+        /// </summary>
+        public virtual IValueFormatValidator FormatValidator => new RegexValidator();
+
+        public object FromEditor(ContentPropertyData editorValue, object currentValue)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService,
+            ILocalizationService localizationService, bool published)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        [JsonProperty("view", Required = Required.Always)]
+        public string View
+        {
+            get => _view;
+            set => _view = IOHelper.ResolveVirtualUrl(value);
+        }
+        public string ValueType { get; set; }
+        public bool IsReadOnly { get; }
+        public bool HideLabel { get; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs b/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
index f566cab..6d6ae5b 100644
--- a/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
+++ b/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.SqlDataSource
+using NPoco;
+
+namespace nuPickers.Shared.SqlDataSource
 {
     using DataSource;
     using nuPickers.Shared.Editor;
@@ -54,7 +56,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId, string typ
                 string sql = Regex.Replace(this.SqlExpression, "\n|\r", " ")
                              .Replace("@contextId", "@0")
                              .Replace("@typeahead", "@1");
-                
+
                 if (this.SqlExpression.Contains("@typeahead")) // WARNING: not a perfect check !
                 {
                     this.handledTypeahead = true;
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
index e74b1fb..e746d0d 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.XmlDataSource
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.XmlDataSource
 {
     using DataSource;
     using nuPickers.Shared.Editor;
@@ -25,7 +27,7 @@ public class XmlDataSource : IDataSource
         bool IDataSource.HandledTypeahead { get { return false; } }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="currentId"></param>
         /// <param name="parentId"></param>
@@ -95,7 +97,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                     if (this.XmlData == "content" && ancestorOrSelfId > 0 && xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null)
                     {
                         // use Umbraco API to get path of all ids above ancestorOrSelfId to root
-                        Queue<int> path = new Queue<int>(ApplicationContext.Current.Services.ContentService.GetById(ancestorOrSelfId).Path.Split(',').Select(x => int.Parse(x)).Reverse().Skip(1));
+                        Queue<int> path = new Queue<int>(Current.Services.ContentService.GetById(ancestorOrSelfId).Path.Split(',').Select(x => int.Parse(x)).Reverse().Skip(1));
 
                         // find the nearest id in the xml
                         do { ancestorOrSelfId = path.Dequeue(); }
diff --git a/source/nuPickers/nuPickerComposer.cs b/source/nuPickers/nuPickerComposer.cs
index 25711e0..982df47 100644
--- a/source/nuPickers/nuPickerComposer.cs
+++ b/source/nuPickers/nuPickerComposer.cs
@@ -1,4 +1,4 @@
-using nuPickers.Compontents;
+using nuPickers.Components;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 
@@ -6,8 +6,16 @@ namespace nuPickers
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
 
-    public class nuPickerComposer : ComponentComposer<nuPickerCompontent>, ICoreComposer
+    public class nuPickerComposer :  ICoreComposer
     {
+        public void Compose(Composition composition)
+        {
+            composition.Register<CacheInvalidationComponent>(
+                Lifetime.Singleton);
+            composition.Register<EmbeddedResourceCompontent>(Lifetime.Singleton);
 
+            composition.Register<RelationMappingComponent>(Lifetime.Singleton);
+
+        }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 608c8f7..2a884b9 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -310,9 +310,10 @@
   <ItemGroup>
     <Compile Include="Caching\Cache.cs" />
     <Compile Include="Caching\CacheConstants.cs" />
-    <Compile Include="Compontents\CacheInvalidationCompontent.cs" />
-    <Compile Include="Compontents\EmbeddedResourceCompontent.cs" />
-    <Compile Include="Compontents\nuPickerCompontent.cs" />
+    <Compile Include="Components\CacheInvalidationComponent.cs" />
+    <Compile Include="Components\EmbeddedResourceCompontent.cs" />
+    <Compile Include="Components\nuPickerCompontent.cs" />
+    <Compile Include="Components\RelationMappingComponent.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
@@ -419,7 +420,6 @@
     <Compile Include="Shared\RelationDataSource\RelationDataSourceApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMapping.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingComment.cs" />
-    <Compile Include="Shared\RelationMapping\RelationMappingEvent.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormatPropertyValueEditor.cs" />
     <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPreValueEditor.cs" />
     <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />

From 81e898fb1d7118d28c79bf940a954a009d6cb805 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sat, 10 Aug 2019 21:09:40 +0100
Subject: [PATCH 03/43] ignore rider files, migrate editor to v8

---
 .gitignore                                    |    1 +
 .../.idea.nuPickers/.idea/contentModel.xml    |  399 -----
 .../.idea/.idea.nuPickers/.idea/workspace.xml | 1390 -----------------
 .../PropertyEditors/BasePropertyEditor.cs     |   11 +-
 .../DotNetCheckBoxPickerPreValueEditor.cs     |    2 +-
 .../EnumDropDownPickerPreValueEditor.cs       |    6 +-
 .../EnumDropDownPickerPropertyEditor.cs       |   13 +-
 .../Shared/CustomLabel/CustomLabel.cs         |   22 +-
 source/nuPickers/Shared/Editor/Editor.cs      |    4 +-
 .../Shared/EnumDataSource/EnumDataSource.cs   |   34 +-
 .../RelationDataSource/RelationDataSource.cs  |    3 +-
 .../nuPickers/Shared/SaveFormat/SaveFormat.cs |   13 +-
 .../SaveFormatPropertyValueEditor.cs          |  109 +-
 source/nuPickers/Validators/RegexValidator.cs |   72 +
 .../nuPickers/Validators/RequiredValidator.cs |   63 +
 source/nuPickers/nuPickers.csproj             |  153 +-
 16 files changed, 219 insertions(+), 2076 deletions(-)
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/contentModel.xml
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/workspace.xml
 create mode 100644 source/nuPickers/Validators/RegexValidator.cs
 create mode 100644 source/nuPickers/Validators/RequiredValidator.cs

diff --git a/.gitignore b/.gitignore
index dc2edc5..cb96301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,3 +173,4 @@ package/nuPickers*.zip
 # Exclude local test sites
 www*/
 source/nuWebTestSite/
+source/.idea/
diff --git a/source/.idea/.idea.nuPickers/.idea/contentModel.xml b/source/.idea/.idea.nuPickers/.idea/contentModel.xml
deleted file mode 100644
index 05de993..0000000
--- a/source/.idea/.idea.nuPickers/.idea/contentModel.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ContentModelStore">
-    <e p="C:\projects\nuPickers\appveyor.yml" t="Include" />
-    <e p="C:\projects\nuPickers\Build\appveyor-semver.ps1" t="Include" />
-    <e p="C:\projects\nuPickers\Build\check-release-version.ps1" t="Include" />
-    <e p="C:\projects\nuPickers\Build\icon.png" t="Include" />
-    <e p="C:\projects\nuPickers\Build\nuPickers.proj" t="Include" />
-    <e p="C:\projects\nuPickers\Build\package.nuspec" t="Include" />
-    <e p="C:\projects\nuPickers\Build\package.xml" t="Include" />
-    <e p="C:\projects\nuPickers\build-appveyor.cmd" t="Include" />
-    <e p="C:\projects\nuPickers\build.cmd" t="Include" />
-    <e p="C:\projects\nuPickers\source" t="IncludeFlat">
-      <e p=".nuget" t="Include">
-        <e p="NuGet.Config" t="Include" />
-        <e p="NuGet.exe" t="Include" />
-        <e p="NuGet.targets" t="Include" />
-      </e>
-      <e p="Build" t="Include" />
-      <e p="nuPickers" t="IncludeRecursive">
-        <e p="amd64" t="Include">
-          <e p="Microsoft.VC90.CRT" t="Include" />
-        </e>
-        <e p="app.config" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="Caching" t="Include">
-          <e p="Cache.cs" t="Include" />
-          <e p="CacheConstants.cs" t="Include" />
-        </e>
-        <e p="Components" t="Include">
-          <e p="CacheInvalidationComponent.cs" t="Include" />
-          <e p="EmbeddedResourceCompontent.cs" t="Include" />
-          <e p="nuPickerCompontent.cs" t="Include" />
-          <e p="RelationMappingComponent.cs" t="Include" />
-        </e>
-        <e p="EmbeddedResource" t="Include">
-          <e p="EmbeddedResource.cs" t="Include" />
-          <e p="EmbeddedResourceController.cs" t="Include" />
-          <e p="EmbeddedResourceHelper.cs" t="Include" />
-          <e p="EmbeddedResourceVirtualFile.cs" t="Include" />
-          <e p="EmbeddedResourceVirtualFileProvider.cs" t="Include" />
-          <e p="EmbeddedResourceVirtualFileWriter.cs" t="Include" />
-        </e>
-        <e p="Extensions" t="Include">
-          <e p="IEnumerableStringExtensions.cs" t="Include" />
-          <e p="IPublishedContentExtensions.cs" t="Include" />
-          <e p="UmbracoHelperExtensions.cs" t="Include" />
-        </e>
-        <e p="Helper.cs" t="Include" />
-        <e p="nuPickerComposer.cs" t="Include" />
-        <e p="nuPickers.csproj" t="IncludeRecursive" />
-        <e p="obj" t="ExcludeRecursive" />
-        <e p="packages.config" t="Include" />
-        <e p="Picker.cs" t="Include" />
-        <e p="PickerPropertyValueConverter.cs" t="Include" />
-        <e p="Properties" t="Include">
-          <e p="AssemblyInfo.cs" t="Include" />
-        </e>
-        <e p="PropertyEditors" t="Include">
-          <e p="BasePropertyEditor.cs" t="Include" />
-          <e p="DotNetCheckBoxPicker" t="Include">
-            <e p="DotNetCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetDropDownPicker" t="Include">
-            <e p="DotNetDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetLabels" t="Include">
-            <e p="DotLabelsPropertyEditor.cs" t="Include" />
-            <e p="DotNetLabelsPreValueEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetPagedListPicker" t="Include">
-            <e p="DotNetPagedListPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetPagedListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetPrefetchListPicker" t="Include">
-            <e p="DotNetPrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetPrefetchListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetRadioButtonPicker" t="Include">
-            <e p="DotNetRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="DotNetTypeaheadListPicker" t="Include">
-            <e p="DotNetTypeaheadListPickerPreValueEditor.cs" t="Include" />
-            <e p="DotNetTypeaheadListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="EnumCheckBoxPicker" t="Include">
-            <e p="EnumCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="EnumCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="EnumDropDownPicker" t="Include">
-            <e p="EnumDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="EnumDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="EnumLabels" t="Include">
-            <e p="EnumLabelsPreValueEditor.cs" t="Include" />
-            <e p="EnumLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="EnumPrefetchListPicker" t="Include">
-            <e p="EnumPrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="EnumPrefetchListPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="EnumRadioButtonPicker" t="Include">
-            <e p="EnumRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="EnumRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonCheckBoxPicker" t="Include">
-            <e p="JsonCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonDropDownPicker" t="Include">
-            <e p="JsonDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonLabels" t="Include">
-            <e p="JsonLabelsPreValueEditor.cs" t="Include" />
-            <e p="JsonLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonPagedListPicker" t="Include">
-            <e p="JsonPagedListPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonPagedListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonPrefetchListPicker" t="Include">
-            <e p="JsonPrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonPrefetchListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonRadioButtonPicker" t="Include">
-            <e p="JsonRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="JsonTypeaheadListPicker" t="Include">
-            <e p="JsonTypeaheadListPickerPreValueEditor.cs" t="Include" />
-            <e p="JsonTypeaheadPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LuceneCheckBoxPicker" t="Include">
-            <e p="LuceneCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="LuceneCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LuceneDropDownPicker" t="Include">
-            <e p="LuceneDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="LuceneDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LuceneLabels" t="Include">
-            <e p="LuceneLabelsPreValueEditor.cs" t="Include" />
-            <e p="LuceneLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LucenePagedListPicker" t="Include">
-            <e p="LucenePagedListPickerPreValueEditor.cs" t="Include" />
-            <e p="LucenePagedListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LucenePrefetchListPicker" t="Include">
-            <e p="LucenePrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="LucenePrefetchListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LuceneRadioButtonPicker" t="Include">
-            <e p="LuceneRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="LuceneRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="LuceneTypeaheadPicker" t="Include">
-            <e p="LuceneTypeaheadListPickerPreValueEditor.cs" t="Include" />
-            <e p="LuceneTypeaheadPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="PropertyEditorConstants.cs" t="Include" />
-          <e p="RelationLabels" t="Include">
-            <e p="RelationLabelsPreValueEditor.cs" t="Include" />
-            <e p="RelationLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlCheckBoxPicker" t="Include">
-            <e p="SqlCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlDropDownPicker" t="Include">
-            <e p="SqlDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlLabels" t="Include">
-            <e p="SqlLabelsPreValueEditor.cs" t="Include" />
-            <e p="SqlLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlPagedListPicker" t="Include">
-            <e p="SqlPagedListPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlPagedListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlPrefetchListPicker" t="Include">
-            <e p="SqlPrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlPrefetchListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlRadioButtonPicker" t="Include">
-            <e p="SqlRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="SqlTypeaheadListPicker" t="Include">
-            <e p="SqlTypeaheadListPickerPreValueEditor.cs" t="Include" />
-            <e p="SqlTypeaheadListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlCheckBoxPicker" t="Include">
-            <e p="XmlCheckBoxPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlCheckBoxPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlDropDownPicker" t="Include">
-            <e p="XmlDropDownPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlDropDownPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlLabels" t="Include">
-            <e p="XmlLabelsPreValueEditor.cs" t="Include" />
-            <e p="XmlLabelsPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlPagedListPicker" t="Include">
-            <e p="XmlPagedListPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlPagedListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlPrefetchListPicker" t="Include">
-            <e p="XmlPrefetchListPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlPrefetchListPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlRadioButtonPicker" t="Include">
-            <e p="XmlRadioButtonPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlRadioButtonPickerPropertyEditor.cs" t="Include" />
-          </e>
-          <e p="XmlTypeaheadListPicker" t="Include">
-            <e p="XmlTypeaheadListPickerPreValueEditor.cs" t="Include" />
-            <e p="XmlTypeaheadListPickerPropertyEditor.cs" t="Include" />
-          </e>
-        </e>
-        <e p="Shared" t="Include">
-          <e p="CheckBoxPicker" t="Include">
-            <e p="CheckBoxPickerConfig.html" t="Include" />
-            <e p="CheckBoxPickerEditor.css" t="Include" />
-            <e p="CheckBoxPickerEditor.html" t="Include" />
-            <e p="CheckBoxPickerEditorController.js" t="Include" />
-          </e>
-          <e p="CustomLabel" t="Include">
-            <e p="CustomLabel.cs" t="Include" />
-            <e p="CustomLabelApiController.cs" t="Include" />
-            <e p="CustomLabelConfig.html" t="Include" />
-            <e p="CustomLabelConfigController.js" t="Include" />
-          </e>
-          <e p="DataSource" t="Include">
-            <e p="DataSource.cs" t="Include" />
-            <e p="DataSourceApiController.cs" t="Include" />
-            <e p="DataSourceApiResponse.cs" t="Include" />
-            <e p="DataSourceResource.js" t="Include" />
-            <e p="IDataSource.cs" t="Include" />
-          </e>
-          <e p="DotNetDataSource" t="Include">
-            <e p="DotNetDataSource.cs" t="Include" />
-            <e p="DotNetDataSourceApiController.cs" t="Include" />
-            <e p="DotNetDataSourceAttribute.cs" t="Include" />
-            <e p="DotNetDataSourceConfig.html" t="Include" />
-            <e p="DotNetDataSourceConfigController.js" t="Include" />
-            <e p="DotNetDataSourceProperty.cs" t="Include" />
-            <e p="IDotNetDataSource.cs" t="Include" />
-            <e p="IDotNetDataSourceKeyed.cs" t="Include" />
-            <e p="IDotNetDataSourcePaged.cs" t="Include" />
-            <e p="IDotNetDataSourceTypeahead.cs" t="Include" />
-          </e>
-          <e p="DropDownPicker" t="Include">
-            <e p="DropDownPickerEditor.html" t="Include" />
-            <e p="DropDownPickerEditorController.js" t="Include" />
-          </e>
-          <e p="Editor" t="Include">
-            <e p="Editor.cs" t="Include" />
-            <e p="EditorDataItem.cs" t="Include" />
-            <e p="EditorResource.js" t="Include" />
-          </e>
-          <e p="EnumDataSource" t="Include">
-            <e p="EnumDataSource.cs" t="Include" />
-            <e p="EnumDataSourceApiController.cs" t="Include" />
-            <e p="EnumDataSourceAttribute.cs" t="Include" />
-            <e p="EnumDataSourceConfig.html" t="Include" />
-            <e p="EnumDataSourceConfigController.js" t="Include" />
-            <e p="EnumExtensions.cs" t="Include" />
-          </e>
-          <e p="HiddenConstant" t="Include">
-            <e p="HiddenConstantConfig.html" t="Include" />
-          </e>
-          <e p="JsonDataSource" t="Include">
-            <e p="JsonDataSource.cs" t="Include" />
-            <e p="JsonDataSourceConfig.html" t="Include" />
-            <e p="JsonDataSourceConfigController.js" t="Include" />
-          </e>
-          <e p="Labels" t="Include">
-            <e p="LabelsConfig.html" t="Include" />
-            <e p="LabelsConfigController.js" t="Include" />
-            <e p="LabelsEditor.html" t="Include" />
-            <e p="LabelsEditorController.js" t="Include" />
-          </e>
-          <e p="LayoutDirection" t="Include">
-            <e p="LayoutDirection.css" t="Include" />
-            <e p="LayoutDirectionConfig.html" t="Include" />
-          </e>
-          <e p="ListPicker" t="Include">
-            <e p="ListPickerConfig.html" t="Include" />
-            <e p="ListPickerEditor.css" t="Include" />
-            <e p="ListPickerEditorController.js" t="Include" />
-            <e p="ListPickerEditorDirectives.js" t="Include" />
-            <e p="ListPickerSelectablePartial.html" t="Include" />
-            <e p="ListPickerSelectedPartial.html" t="Include" />
-          </e>
-          <e p="LuceneDataSource" t="Include">
-            <e p="LuceneDataSource.cs" t="Include" />
-            <e p="LuceneDataSourceApiController.cs" t="Include" />
-            <e p="LuceneDataSourceConfig.html" t="Include" />
-            <e p="LuceneDataSourceConfigController.js" t="Include" />
-          </e>
-          <e p="PagedListPicker" t="Include">
-            <e p="PagedListPickerConfig.html" t="Include" />
-            <e p="PagedListPickerEditor.css" t="Include" />
-            <e p="PagedListPickerEditor.html" t="Include" />
-            <e p="PagedListPickerEditorController.js" t="Include" />
-          </e>
-          <e p="Paging" t="Include">
-            <e p="PageMarker.cs" t="Include" />
-          </e>
-          <e p="PrefetchListPicker" t="Include">
-            <e p="PrefetchListPickerConfig.html" t="Include" />
-            <e p="PrefetchListPickerEditor.html" t="Include" />
-            <e p="PrefetchListPickerEditorController.js" t="Include" />
-          </e>
-          <e p="PropertyEditor" t="Include">
-            <e p="PropertyEditorConfig.css" t="Include" />
-          </e>
-          <e p="RadioButtonPicker" t="Include">
-            <e p="RadioButtonPickerEditor.html" t="Include" />
-            <e p="RadioButtonPickerEditorController.js" t="Include" />
-          </e>
-          <e p="RelationDataSource" t="Include">
-            <e p="RelationDataSource.cs" t="Include" />
-            <e p="RelationDataSourceApiController.cs" t="Include" />
-            <e p="RelationDataSourceConfig.html" t="Include" />
-            <e p="RelationDataSourceConfigController.js" t="Include" />
-          </e>
-          <e p="RelationMapping" t="Include">
-            <e p="RelationMapping.cs" t="Include" />
-            <e p="RelationMappingApiController.cs" t="Include" />
-            <e p="RelationMappingComment.cs" t="Include" />
-            <e p="RelationMappingConfig.html" t="Include" />
-            <e p="RelationMappingConfigController.js" t="Include" />
-            <e p="RelationMappingResource.js" t="Include" />
-          </e>
-          <e p="SaveFormat" t="Include">
-            <e p="SaveFormat.cs" t="Include" />
-            <e p="SaveFormatConfig.html" t="Include" />
-            <e p="SaveFormatConfigController.js" t="Include" />
-            <e p="SaveFormatPropertyValueEditor.cs" t="Include" />
-            <e p="SaveFormatResource.js" t="Include" />
-          </e>
-          <e p="SqlDataSource" t="Include">
-            <e p="SqlDataSource.cs" t="Include" />
-            <e p="SqlDataSourceApiController.cs" t="Include" />
-            <e p="SqlDataSourceConfig.html" t="Include" />
-            <e p="SqlDataSourceConfigController.js" t="Include" />
-          </e>
-          <e p="TypeaheadListPicker" t="Include">
-            <e p="TypeaheadListPicker.cs" t="Include" />
-            <e p="TypeaheadListPickerConfig.html" t="Include" />
-            <e p="TypeaheadListPickerEditor.html" t="Include" />
-            <e p="TypeaheadListPickerEditorController.js" t="Include" />
-            <e p="TypeaheadListPickerEditorDirectives.js" t="Include" />
-          </e>
-          <e p="XmlDataSource" t="Include">
-            <e p="XmlDataSource.cs" t="Include" />
-            <e p="XmlDataSourceConfig.html" t="Include" />
-            <e p="XmlDataSourceConfigController.js" t="Include" />
-          </e>
-        </e>
-        <e p="x86" t="Include">
-          <e p="Microsoft.VC90.CRT" t="Include" />
-        </e>
-      </e>
-      <e p="nuPickers.sln" t="IncludeFlat" />
-      <e p="nuPickers.Tests" t="IncludeRecursive">
-        <e p="nuPickers.Tests.csproj" t="IncludeRecursive" />
-      </e>
-      <e p="packages" t="ExcludeRecursive">
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\Microsoft.VC90.CRT\msvcr90.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceca40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlcecompact40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceer40EN.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceme40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlceqp40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x64\native\sqlcese40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\Microsoft.VC90.CRT\msvcr90.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceca40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlcecompact40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceer40EN.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceme40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlceqp40.dll" t="Include" />
-        <e p="Umbraco.SqlServerCE.4.0.0.1\runtimes\win-x86\native\sqlcese40.dll" t="Include" />
-      </e>
-    </e>
-    <e p="C:\Users\abi\.Rider2019.1\system\extResources" t="IncludeRecursive" />
-    <e p="C:\Users\abi\.Rider2019.1\system\resharper-host\local\Transient\ReSharperHost\v191\SolutionCaches\_nuPickers.-334270542.00" t="ExcludeRecursive" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/workspace.xml b/source/.idea/.idea.nuPickers/.idea/workspace.xml
deleted file mode 100644
index 765076e..0000000
--- a/source/.idea/.idea.nuPickers/.idea/workspace.xml
+++ /dev/null
@@ -1,1390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="ab600b7e-aec1-4714-98f5-46aa5af89500" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/contentModel.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers.Tests/nuPickers.Tests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Picker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Picker.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/nuPickers/nuPickers.csproj" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
-              <folding>
-                <marker date="1565441391697" expanded="true" signature="6:56" ph="..." />
-                <marker date="1565441391697" expanded="true" signature="103:847" ph="{...}" />
-                <marker date="1565441391697" expanded="true" signature="116:224" ph="..." />
-                <marker date="1565441391697" expanded="true" signature="344:845" ph="{...}" />
-                <marker date="1565441391697" expanded="true" signature="404:839" ph="{...}" />
-                <marker date="1565441391697" expanded="true" signature="651:827" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1799">
-              <caret line="110" column="100" lean-forward="true" selection-start-line="110" selection-start-column="100" selection-end-line="110" selection-end-column="100" />
-              <folding>
-                <marker date="1565441516548" expanded="true" signature="73:7220" ph="{...}" />
-                <marker date="1565441516548" expanded="false" signature="86:191" ph="..." />
-                <marker date="1565441516548" expanded="true" signature="197:277" ph="/// the core relation mapping functionality ... " />
-                <marker date="1565441516548" expanded="true" signature="319:7218" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="334:841" ph="/// Get all related id for the supplied criteria ... " />
-                <marker date="1565441516548" expanded="true" signature="979:2983" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="1101:2928" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="1279:2914" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="1886:2204" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="2229:2793" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="2555:2771" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="2993:3484" ph="/// ... " />
-                <marker date="1565441516548" expanded="true" signature="3635:7212" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="3801:7202" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="4382:4702" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="4723:5282" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="5051:5264" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="5534:6850" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="5652:6832" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="5945:6810" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="6134:6515" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="6971:7188" ph="{...}" />
-                <marker date="1565441516548" expanded="true" signature="7051:7170" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="296">
-              <caret line="22" column="9" lean-forward="true" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
-              <folding>
-                <marker date="1565441522112" expanded="true" signature="42:1087" ph="{...}" />
-                <marker date="1565441522112" expanded="false" signature="55:190" ph="..." />
-                <marker date="1565441522112" expanded="true" signature="307:1085" ph="{...}" />
-                <marker date="1565441522112" expanded="true" signature="385:761" ph="{...}" />
-                <marker date="1565441522112" expanded="true" signature="573:749" ph="{...}" />
-                <marker date="1565441522112" expanded="true" signature="949:1079" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-340">
-              <caret line="63" column="13" lean-forward="true" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-              <folding>
-                <marker date="1565441597254" expanded="true" signature="73:4920" ph="{...}" />
-                <marker date="1565441597254" expanded="false" signature="86:198" ph="..." />
-                <marker date="1565441597254" expanded="true" signature="204:306" ph="/// Represents the data stored in the comment field of a relation ... " />
-                <marker date="1565441597254" expanded="true" signature="346:4918" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="361:458" ph="/// The property alias of the picker using relations ... " />
-                <marker date="1565441597254" expanded="true" signature="526:620" ph="/// Used to identify a specific dataType instance ... " />
-                <marker date="1565441597254" expanded="true" signature="686:762" ph="/// Used to identify a dataType ... " />
-                <marker date="1565441597254" expanded="true" signature="834:1129" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
-                <marker date="1565441597254" expanded="true" signature="1206:2767" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="1518:1657" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="1674:2309" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="1802:1951" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="1972:2295" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="2115:2277" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="2348:2552" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="2569:2757" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="2777:2977" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
-                <marker date="1565441597254" expanded="true" signature="3033:3871" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="3096:3861" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="3130:3636" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="3675:3847" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="3881:4071" ph="/// Helper to determine if the property is inside an Archetype ... " />
-                <marker date="1565441597254" expanded="true" signature="4109:4201" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="4271:4499" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="4297:4413" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="4444:4489" ph="{...}" />
-                <marker date="1565441597254" expanded="true" signature="4509:4639" ph="/// Get the serialized XML comment ... " />
-                <marker date="1565441597254" expanded="true" signature="4676:4911" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1530">
-              <caret line="90" column="69" lean-forward="true" selection-start-line="90" selection-start-column="69" selection-end-line="90" selection-end-column="69" />
-              <folding>
-                <marker date="1565441879547" expanded="true" signature="6:361" ph="..." />
-                <marker date="1565441879547" expanded="true" signature="393:5226" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="437:5224" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="648:762" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="793:862" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="981:1184" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="1217:1286" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="1379:1458" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="1546:1625" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="1716:1795" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="1805:1988" ph="/// combined event for content / media / member ... " />
-                <marker date="1565441879547" expanded="true" signature="2073:5218" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="2147:5208" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="2368:5194" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="3027:5176" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="3214:4639" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="3299:3429" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="3462:4613" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="3952:4121" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="4187:4352" ph="{...}" />
-                <marker date="1565441879547" expanded="true" signature="4419:4583" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="12" column="61" lean-forward="true" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
-              <folding>
-                <marker date="1565441897395" expanded="true" signature="6:77" ph="..." />
-                <marker date="1565441897395" expanded="true" signature="98:550" ph="{...}" />
-                <marker date="1565441897395" expanded="true" signature="200:548" ph="{...}" />
-                <marker date="1565441897395" expanded="true" signature="259:542" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-102">
-              <caret line="96" column="81" selection-start-line="96" selection-start-column="81" selection-end-line="96" selection-end-column="81" />
-              <folding>
-                <marker date="1565440742160" expanded="true" signature="8:216" ph="..." />
-                <marker date="1565440742160" expanded="true" signature="255:5216" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="268:348" ph="..." />
-                <marker date="1565440742160" expanded="true" signature="354:477" ph="/// This class exists so as to be able to save xml direclty into the Umbraco xml cache ... " />
-                <marker date="1565440742160" expanded="true" signature="544:5214" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="590:758" ph="/// reconstruct values from original (default) property value editor ... " />
-                <marker date="1565440742160" expanded="true" signature="853:1044" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="1118:1235" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="1245:1573" ph="/// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData ... " />
-                <marker date="1565440742160" expanded="true" signature="1698:1989" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="1817:1891" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="1922:1979" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="2088:3221" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="2307:2558" ph="/* mandatory and regex validators cannot be part of valueEditor.Validators because they ... */" />
-                <marker date="1565440742160" expanded="true" signature="2585:2789" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="2934:3142" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="3231:3331" ph="/// A collection of validators for the pre value editor ... " />
-                <marker date="1565440742160" expanded="true" signature="3448:3577" ph="/// Gets the validator used to validate the special property type -level &quot;required&quot;. ... " />
-                <marker date="1565440742160" expanded="true" signature="3672:3799" ph="/// Gets the validator used to validate the special property type -level &quot;format&quot;. ... " />
-                <marker date="1565440742160" expanded="true" signature="3973:4049" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="4180:4256" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="4432:4508" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="4620:4696" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="4812:4888" ph="{...}" />
-                <marker date="1565440742160" expanded="true" signature="4975:5083" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="499">
-              <caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
-              <folding>
-                <marker date="1565435304332" expanded="true" signature="6:181" ph="..." />
-                <marker date="1565435304332" expanded="true" signature="213:1510" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="307:1508" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="441:500" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="532:601" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="720:1400" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="1023:1156" ph="{...}" />
-                <marker date="1565435304332" expanded="true" signature="1433:1502" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="56" column="68" lean-forward="true" selection-start-line="56" selection-start-column="68" selection-end-line="56" selection-end-column="95" />
-              <folding>
-                <marker date="1565441918806" expanded="false" signature="6:208" ph="..." />
-                <marker date="1565441918806" expanded="true" signature="240:2364" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="334:2362" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="545:659" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="690:759" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="878:1163" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="1196:1265" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="1359:1539" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="1637:1819" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="1916:2085" ph="{...}" />
-                <marker date="1565441918806" expanded="true" signature="2186:2356" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
-              <folding>
-                <marker date="1565435225174" expanded="true" signature="30:83" ph="{...}" />
-                <marker date="1565435225174" expanded="true" signature="68:81" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>PropertyCacheLevel.Element</find>
-      <find>PickerPropertyValueConverter</find>
-      <find>AsDynamicPublishedContent</find>
-      <find>AsPublishedContent</find>
-      <find>AsDynamic</find>
-      <find>LuceneDataSource</find>
-      <find>ApplicationContext.</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Helper.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Picker.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileProvider.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Caching/Cache.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Caching/CacheConstants.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFile.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceHelper.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" root0="FORCE_HIGHLIGHTING" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Compontents/nuPickerCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Compontents/CacheInvalidationCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Compontents/EmbeddedResourceCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Picker.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs" />
-        <option value="$PROJECT_DIR$/nuPickers/nuPickerComposer.cs" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectConfigurationFiles">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/.idea/.idea.nuPickers/.idea/vcs.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
-    <option name="y" value="2" />
-    <option name="width" value="1932" />
-    <option name="height" value="1045" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator currentView="SolutionExplorer" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="FileSystemExplorer" />
-      <pane id="AssemblyExplorer" />
-      <pane id="SolutionExplorer">
-        <subPane>
-          <expand>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Components" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="RelationMapping" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-            <path>
-              <item name="" type="784c90a0:SolutionExplorerRootNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="nuPickers" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="Shared" type="24d0babc:SolutionExplorerModelNode" />
-              <item name="SaveFormat" type="24d0babc:SolutionExplorerModelNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-        <option name="show-all-files" value="false" />
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
-    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="editor.config.ad.shown" value="true" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ab600b7e-aec1-4714-98f5-46aa5af89500" name="Default Changelist" comment="" />
-      <created>1565429039837</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1565429039837</updated>
-      <workItem from="1565429042534" duration="10392000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10392000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="2" width="1932" height="1045" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="NuGet" weight="0.32976446" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" visible="true" weight="0.32976446" />
-      <window_info anchor="bottom" id="Unit Tests" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Performance Profiler" />
-      <window_info anchor="bottom" id="Build" weight="0.32976446" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Errors In Solution" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="Unit Tests Coverage" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="UnityProjectConfiguration" hasMinimizedUI="null" />
-  <component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <breakpoint enabled="true" suspend="NONE" type="DotNet Exception Breakpoints">
-          <properties exception="System.Threading.ThreadAbortException" displayValue="System.Threading.ThreadAbortException" />
-          <option name="timeStamp" value="1" />
-        </breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheConstants.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="26" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
-          <folding>
-            <marker date="1565428945830" expanded="true" signature="27:540" ph="{...}" />
-            <marker date="1565428945830" expanded="true" signature="70:538" ph="{...}" />
-            <marker date="1565428945830" expanded="true" signature="85:205" ph="/// key appended with a dataType id - stores all the prevalues for a picker ... " />
-            <marker date="1565428945830" expanded="true" signature="291:470" ph="/// key appended with a context id and property alias - stores picked keys (only applies when picker is in relati ... " />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/Cache.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-          <folding>
-            <marker date="1565428945829" expanded="true" signature="27:5908" ph="{...}" />
-            <marker date="1565428945829" expanded="false" signature="40:145" ph="..." />
-            <marker date="1565428945829" expanded="true" signature="178:5906" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="193:293" ph="/// Singleton instance of the &lt;see cref=&quot;Cache&quot;/&gt; class ... " />
-            <marker date="1565428945829" expanded="true" signature="362:467" ph="/// Internal instance of the &lt;see cref=&quot;MemoryCache&quot;/&gt; class ... " />
-            <marker date="1565428945829" expanded="true" signature="518:722" ph="/// Locker collection of all cache keys currently having their 'expensive functions' evaluated ... " />
-            <marker date="1565428945829" expanded="true" signature="822:842" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="852:920" ph="/// Private constructor ... " />
-            <marker date="1565428945829" expanded="true" signature="944:1111" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="1121:1200" ph="/// Get the instance of this cache ... " />
-            <marker date="1565428945829" expanded="true" signature="1239:1333" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="1265:1323" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="1343:1652" ph="/// Queries key in cache for object of type T ... " />
-            <marker date="1565428945829" expanded="true" signature="1695:1793" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="1803:2228" ph="/// Queries key in cache for object of type T ... " />
-            <marker date="1565428945829" expanded="true" signature="2287:2535" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="2377:2466" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="2545:3178" ph="/// Queries key in cache for object of type T, otherwise executes expensiveFunc and ensures cache is set ... " />
-            <marker date="1565428945829" expanded="true" signature="3264:4115" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="3386:4071" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="3769:3937" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="4125:4506" ph="/// Populate the cache key with the supplied object ... " />
-            <marker date="1565428945829" expanded="true" signature="4588:5086" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="4637:5076" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="4684:4941" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="4962:5062" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="5096:5243" ph="/// Remove an item from cache ... " />
-            <marker date="1565428945829" expanded="true" signature="5289:5356" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="5366:5605" ph="/// Remove all items from cache for which the lambda returns true ... " />
-            <marker date="1565428945829" expanded="true" signature="5661:5900" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="5743:5890" ph="{...}" />
-            <marker date="1565428945829" expanded="true" signature="5790:5876" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Helper.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-          <folding>
-            <marker date="1565428945849" expanded="true" signature="19:4425" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="32:247" ph="..." />
-            <marker date="1565428945849" expanded="true" signature="281:4423" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="350:1213" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="579:849" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="746:835" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1012:1168" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1223:1411" ph="/// attempts to get an assembly by it's name ... " />
-            <marker date="1565428945849" expanded="true" signature="1477:2314" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1589:1742" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1611:1664" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1698:1728" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1905:2278" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="1939:2173" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="2212:2264" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="2324:2574" ph="/// extension method on Assembly to handle reflection loading exceptions ... " />
-            <marker date="1565428945849" expanded="true" signature="2657:2992" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="2683:2755" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="2805:2887" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="2918:2982" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="3002:3318" ph="/// uses supplied url to check the file system (if prefixed with ~/) else makes an http query ... " />
-            <marker date="1565428945849" expanded="true" signature="3376:4417" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="3471:4381" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="3562:4216" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="3670:3992" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="3827:3970" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="4030:4198" ph="{...}" />
-            <marker date="1565428945849" expanded="true" signature="4293:4367" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Caching/CacheInvalidation.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="23" lean-forward="true" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/UmbracoHelperExtensions.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="741">
-          <caret line="43" column="53" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="53" />
-          <folding>
-            <marker date="1565431363231" expanded="true" signature="75:2094" ph="{...}" />
-            <marker date="1565431363231" expanded="false" signature="88:131" ph="..." />
-            <marker date="1565431363231" expanded="true" signature="182:2092" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="197:662" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-            <marker date="1565431363231" expanded="true" signature="766:855" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="865:1269" ph="/// for a given umbraco Id, attempt to get the appropriate IPublishedContent (be that a typed content / media or  ... " />
-            <marker date="1565431363231" expanded="true" signature="1370:2086" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1537:1680" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1723:2038" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1813:1914" ph="{...}" />
-            <marker date="1565431363231" expanded="true" signature="1936:2024" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IEnumerableStringExtensions.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-          <folding>
-            <marker date="1565435018168" expanded="true" signature="104:854" ph="{...}" />
-            <marker date="1565435018168" expanded="false" signature="117:221" ph="..." />
-            <marker date="1565435018168" expanded="true" signature="276:852" ph="{...}" />
-            <marker date="1565435018168" expanded="true" signature="292:577" ph="/// TODO: migrate out of Picker obj ... " />
-            <marker date="1565435018168" expanded="true" signature="682:846" ph="{...}" />
-            <marker date="1565435018168" expanded="true" signature="694:836" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Extensions/IPublishedContentExtensions.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="58">
-          <caret line="7" column="51" lean-forward="true" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
-          <folding>
-            <marker date="1565431333219" expanded="true" signature="75:1142" ph="{...}" />
-            <marker date="1565431333219" expanded="false" signature="88:131" ph="..." />
-            <marker date="1565431333219" expanded="true" signature="184:1140" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="199:596" ph="/// Get a Picker model for the supplied propertyAlias on this &lt;see cref=&quot;IPublishedContent&quot;/&gt; ... " />
-            <marker date="1565431333219" expanded="true" signature="698:1134" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="874:1098" ph="{...}" />
-            <marker date="1565431333219" expanded="true" signature="973:1084" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/B6D68F36-8D66-45AF-BF0E-07217963C67F/3a/4e882835/KeyValuePair`2.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="591">
-          <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="12" />
-          <folding>
-            <marker date="1565431253964" expanded="true" signature="36:659" ph="{...}" />
-            <marker date="1565431253964" expanded="true" signature="81:657" ph="{...}" />
-            <marker date="1565431253964" expanded="true" signature="96:180" ph="/// Root url for all embedded resources ... " />
-            <marker date="1565431253964" expanded="true" signature="266:358" ph="/// namespace prefix for all embedded resources ... " />
-            <marker date="1565431253964" expanded="true" signature="437:597" ph="/// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded conte ... " />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceController.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding>
-            <marker date="1565428945833" expanded="true" signature="36:975" ph="{...}" />
-            <marker date="1565428945833" expanded="false" signature="49:110" ph="..." />
-            <marker date="1565428945833" expanded="true" signature="116:219" ph="/// Handles returning embedded resource files (html, css, js, png) ... " />
-            <marker date="1565428945833" expanded="true" signature="276:973" ph="{...}" />
-            <marker date="1565428945833" expanded="true" signature="356:790" ph="{...}" />
-            <marker date="1565428945833" expanded="true" signature="625:739" ph="{...}" />
-            <marker date="1565428945833" expanded="true" signature="843:967" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceHelper.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-          <folding>
-            <marker date="1565428945840" expanded="true" signature="36:2509" ph="{...}" />
-            <marker date="1565428945840" expanded="false" signature="49:128" ph="..." />
-            <marker date="1565428945840" expanded="true" signature="178:2507" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="193:465" ph="/// Determine if a resource exists for the given resource name ... " />
-            <marker date="1565428945840" expanded="true" signature="530:746" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="756:978" ph="/// Gets the stream for the given resource name ... " />
-            <marker date="1565428945840" expanded="true" signature="1042:1528" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="1383:1492" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="1538:1852" ph="/// Convert a url for an embedded resource, to a namespaced string for an embedded resource ... " />
-            <marker date="1565428945840" expanded="true" signature="1920:2501" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="2093:2184" ph="{...}" />
-            <marker date="1565428945840" expanded="true" signature="2261:2457" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFile.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
-          <folding>
-            <marker date="1565428945842" expanded="true" signature="36:1517" ph="{...}" />
-            <marker date="1565428945842" expanded="false" signature="49:107" ph="..." />
-            <marker date="1565428945842" expanded="true" signature="113:189" ph="/// The embedded resource virtual file. ... " />
-            <marker date="1565428945842" expanded="true" signature="251:1515" ph="{...}" />
-            <marker date="1565428945842" expanded="true" signature="266:331" ph="/// The virtual file ... " />
-            <marker date="1565428945842" expanded="true" signature="386:755" ph="/// Initializes a new instance of the &lt;see cref=&quot;EmbeddedResourceVirtualFile&quot;/&gt; class.  ... " />
-            <marker date="1565428945842" expanded="true" signature="818:882" ph="{...}" />
-            <marker date="1565428945842" expanded="true" signature="892:1125" ph="/// When overridden in a derived class, returns a read-only stream to the virtual resource. ... " />
-            <marker date="1565428945842" expanded="true" signature="1154:1344" ph="{...}" />
-            <marker date="1565428945842" expanded="true" signature="1354:1417" ph="/// Gets the path. ... " />
-            <marker date="1565428945842" expanded="true" signature="1444:1509" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileProvider.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
-          <folding>
-            <marker date="1565428945843" expanded="true" signature="36:1091" ph="{...}" />
-            <marker date="1565428945843" expanded="false" signature="49:104" ph="..." />
-            <marker date="1565428945843" expanded="true" signature="110:151" ph="///  ... " />
-            <marker date="1565428945843" expanded="true" signature="234:1089" ph="{...}" />
-            <marker date="1565428945843" expanded="true" signature="249:377" ph="///  ... " />
-            <marker date="1565428945843" expanded="true" signature="428:748" ph="{...}" />
-            <marker date="1565428945843" expanded="true" signature="758:886" ph="///  ... " />
-            <marker date="1565428945843" expanded="true" signature="942:1083" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-928">
-          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
-          <folding>
-            <marker date="1565428945812" expanded="true" signature="42:4134" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="55:138" ph="..." />
-            <marker date="1565428945812" expanded="true" signature="206:4132" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="636:1209" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="1276:1641" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="1712:2269" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="2335:2700" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="2773:3446" ph="{...}" />
-            <marker date="1565428945812" expanded="true" signature="3521:4126" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/PickerPropertyValueConverter.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="95" column="13" selection-start-line="95" selection-start-column="13" selection-end-line="95" selection-end-column="13" />
-          <folding>
-            <marker date="1565434436984" expanded="true" signature="6:60" ph="..." />
-            <marker date="1565434436984" expanded="true" signature="81:6077" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="94:285" ph="..." />
-            <marker date="1565434436984" expanded="true" signature="361:6075" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="413:433" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="443:648" ph="/// This is a generic converter for all nuPicker Picker PropertyEditors ... " />
-            <marker date="1565434436984" expanded="true" signature="726:801" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="813:1042" ph="/// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker ... " />
-            <marker date="1565434436984" expanded="true" signature="1106:3796" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="1149:3737" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="3806:4276" ph="/// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by  ... " />
-            <marker date="1565434436984" expanded="true" signature="4477:5385" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="4618:4727" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="4758:4817" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="4863:5098" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="4986:5084" ph="{...}" />
-            <marker date="1565434436984" expanded="true" signature="5395:5846" ph="/// Override the default behavour which duck types (converting a string that looks like a number into a number) ... " />
-            <marker date="1565434436984" expanded="true" signature="6008:6065" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Picker.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-354">
-          <caret line="303" column="53" selection-start-line="303" selection-start-column="35" selection-end-line="303" selection-end-column="53" />
-          <folding>
-            <marker date="1565434905086" expanded="true" signature="6:72" ph="..." />
-            <marker date="1565434905086" expanded="true" signature="93:15579" ph="{...}" />
-            <marker date="1565434905086" expanded="false" signature="106:552" ph="..." />
-            <marker date="1565434905086" expanded="true" signature="558:734" ph="/// This class is the main consumer interface ... " />
-            <marker date="1565434905086" expanded="true" signature="758:15577" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="773:895" ph="/// cache var, stores value after querying relations or parsing a save format ... " />
-            <marker date="1565434905086" expanded="true" signature="949:4806" ph="Constructors" />
-            <marker date="1565434905086" expanded="true" signature="979:1484" ph="/// public constructor - picker value is calculated from lookup, either the published value from cache, or the la ... " />
-            <marker date="1565434905086" expanded="true" signature="1574:3689" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="1760:2480" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="1889:2466" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="2521:3462" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="2655:3448" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="2818:3430" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="3489:3679" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="3699:4358" ph="/// internal constructor - picker value is supplied (used by PropertyValueConverter &amp; RelationMappingEvent) ... " />
-            <marker date="1565434905086" expanded="true" signature="4496:4786" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="4816:9329" ph="Properties" />
-            <marker date="1565434905086" expanded="true" signature="4844:4917" ph="/// the value of this picker ... " />
-            <marker date="1565434905086" expanded="true" signature="5100:5238" ph="/// returns a collection of all picked keys (regardless as to how / where they are persisted) ... " />
-            <marker date="1565434905086" expanded="true" signature="5284:6678" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="5310:6435" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="5369:6380" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="5481:6150" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="5760:6126" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="6175:6362" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="6589:6668" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="6688:6815" ph="/// returns a collection of all picked keys that can be converted into integer ids ... " />
-            <marker date="1565434905086" expanded="true" signature="6859:7095" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="6885:7085" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="7105:7213" ph="/// the relation type alias if relation mapping active, or null ... " />
-            <marker date="1565434905086" expanded="true" signature="7255:7874" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="7281:7864" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="7592:7820" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="7884:7976" ph="/// the id of the content, media or member item ... " />
-            <marker date="1565434905086" expanded="true" signature="8031:8079" ph="/// ... " />
-            <marker date="1565434905086" expanded="true" signature="8132:8242" ph="/// the alias of this picker on the content, media or member item ... " />
-            <marker date="1565434905086" expanded="true" signature="8304:8430" ph="/// the data-type this picker is using (no association with a specific SaveValue) ... " />
-            <marker date="1565434905086" expanded="true" signature="8485:8686" ph="/// The alias used to identify a picker type (could be calculated from the dataType id, but this avoids additiona ... " />
-            <marker date="1565434905086" expanded="true" signature="8753:8916" ph="/// Property accessor to ensure the query to populate the data-type configruation options is only done once per s ... " />
-            <marker date="1565434905086" expanded="true" signature="8978:9309" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="9004:9299" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="9143:9283" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="9339:15571" ph="Methods" />
-            <marker date="1565434905086" expanded="true" signature="9364:9540" ph="/// Get all the prevalues for this picker ... " />
-            <marker date="1565434905086" expanded="true" signature="9606:9669" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="9679:9883" ph="/// Find a specific prevalue for this picker ... " />
-            <marker date="1565434905086" expanded="true" signature="9937:10099" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="10109:10579" ph="/// Get a collection of all (key/label) items for this picker ... " />
-            <marker date="1565434905086" expanded="true" signature="10666:11118" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="11128:11369" ph="/// Get a collection of the picked (key/label) items ... " />
-            <marker date="1565434905086" expanded="true" signature="11439:12231" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="11607:12146" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="12241:12486" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as IPublishedContent) ... " />
-            <marker date="1565434905086" expanded="true" signature="12637:12714" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="12724:12902" ph="/// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) ... " />
-            <marker date="1565434905086" expanded="true" signature="12999:13065" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13075:13332" ph="/// get all picked items and attempt to convert them to the supplied enum type T ... " />
-            <marker date="1565434905086" expanded="true" signature="13406:14142" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13451:13545" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13648:14105" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13730:14091" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13804:14073" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="13944:14051" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="14152:14319" ph="/// get all picked items as a collection of Enum ... " />
-            <marker date="1565434905086" expanded="true" signature="14362:15207" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="14538:15170" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="14848:15156" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="14937:15138" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="15018:15116" ph="{...}" />
-            <marker date="1565434905086" expanded="true" signature="15217:15398" ph="/// Returns the string value for this picker ... " />
-            <marker date="1565434905086" expanded="true" signature="15440:15551" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
-          <folding>
-            <marker date="1565435438866" expanded="true" signature="84:2594" ph="{...}" />
-            <marker date="1565435438866" expanded="false" signature="97:273" ph="..." />
-            <marker date="1565435438866" expanded="true" signature="2434:2592" ph="{...}" />
-            <marker date="1565435438866" expanded="true" signature="2505:2586" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="5" column="44" lean-forward="true" selection-start-line="5" selection-start-column="44" selection-end-line="5" selection-end-column="44" />
-          <folding>
-            <marker date="1565435372411" expanded="true" signature="56:1322" ph="{...}" />
-            <marker date="1565435372411" expanded="false" signature="69:136" ph="..." />
-            <marker date="1565435372411" expanded="true" signature="214:1320" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="35" column="11" selection-start-line="35" selection-start-column="11" selection-end-line="36" />
-          <folding>
-            <marker date="1565434078848" expanded="true" signature="36:1636" ph="{...}" />
-            <marker date="1565434078848" expanded="false" signature="49:270" ph="..." />
-            <marker date="1565434078848" expanded="true" signature="276:346" ph="/// The embedded resource writer. ... " />
-            <marker date="1565434078848" expanded="true" signature="425:1634" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="567:626" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="806:1407" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="832:1214" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="986:1200" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="1254:1397" ph="{...}" />
-            <marker date="1565434078848" expanded="true" signature="1417:1489" ph="/// Gets the file provider. ... " />
-            <marker date="1565434078848" expanded="true" signature="1538:1628" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
-          <folding>
-            <marker date="1565428946110" expanded="true" signature="26:700" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="39:190" ph="..." />
-            <marker date="1565428946110" expanded="true" signature="303:698" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="356:692" ph="{...}" />
-            <marker date="1565428946110" expanded="true" signature="566:680" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/CustomLabel/CustomLabel.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1506">
-          <caret line="25" column="43" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
-          <folding>
-            <marker date="1565431622375" expanded="true" signature="39:5058" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="52:360" ph="..." />
-            <marker date="1565431622375" expanded="true" signature="392:5056" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="456:568" ph="/// return true when there is a published page anywhere on the site ... " />
-            <marker date="1565431622375" expanded="true" signature="756:1007" ph="/// ... " />
-            <marker date="1565431622375" expanded="true" signature="1092:2088" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="1392:1608" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="1625:2077" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="1900:2063" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="2098:2421" ph="/// parses the collection of options, potentially transforming the content of the label ... " />
-            <marker date="1565431622375" expanded="true" signature="2534:3104" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="2794:2971" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="3114:3547" ph="/// ... " />
-            <marker date="1565431622375" expanded="true" signature="3646:4398" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="3741:4361" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="4408:4624" ph="/// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functio ... " />
-            <marker date="1565431622375" expanded="true" signature="4675:5050" ph="{...}" />
-            <marker date="1565431622375" expanded="true" signature="4926:4994" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/JsonDataSource/JsonDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="94" selection-start-line="94" selection-end-line="95" />
-          <folding>
-            <marker date="1565438963951" expanded="true" signature="41:4635" ph="{...}" />
-            <marker date="1565438963951" expanded="false" signature="54:270" ph="..." />
-            <marker date="1565438963951" expanded="true" signature="317:4633" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="440:499" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="870:945" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="1057:1165" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="1300:1517" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="1527:1785" ph="/// Main method for retrieving nuPicker data items. ... " />
-            <marker date="1565438963951" expanded="true" signature="1863:4627" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="2154:2249" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="2297:2443" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="2476:4524" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="2680:3123" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="2887:3049" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="3160:4510" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="3259:3373" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="3429:3606" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="3648:4492" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="3775:4470" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="4060:4444" ph="{...}" />
-            <marker date="1565438963951" expanded="true" signature="4237:4412" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="142" column="17" lean-forward="true" selection-start-line="142" selection-start-column="17" selection-end-line="142" selection-end-column="17" />
-          <folding>
-            <marker date="1565439039353" expanded="true" signature="43:6220" ph="{...}" />
-            <marker date="1565439039353" expanded="false" signature="56:260" ph="..." />
-            <marker date="1565439039353" expanded="true" signature="309:6218" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="434:493" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="916:2021" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="1362:1974" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="1444:1620" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="2133:3203" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="2579:3123" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="2657:2769" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="3338:5187" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="3809:5140" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="3957:4548" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="4569:5126" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="5278:6212" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="5447:6202" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="5526:5997" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="5707:5979" ph="{...}" />
-            <marker date="1565439039353" expanded="true" signature="6018:6188" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/XmlDataSource/XmlDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1547">
-          <caret line="99" column="60" selection-start-line="99" selection-start-column="60" selection-end-line="99" selection-end-column="60" />
-          <folding>
-            <marker date="1565434377347" expanded="true" signature="71:6009" ph="{...}" />
-            <marker date="1565434377347" expanded="false" signature="84:302" ph="..." />
-            <marker date="1565434377347" expanded="true" signature="348:6007" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="655:876" ph="/// ... " />
-            <marker date="1565434377347" expanded="true" signature="990:1075" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="1187:1305" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="1440:1667" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="1760:6001" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="1921:2757" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="2795:5954" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="2908:4046" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="3334:3897" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="4442:5940" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="4481:4691" ph="/* media xml is wrapped in a &lt;Media id=&quot;-1&quot; /&gt; node to be valid, exclude this from any results ... */" />
-            <marker date="1565434377347" expanded="true" signature="4970:5922" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="5252:5900" ph="{...}" />
-            <marker date="1565434377347" expanded="true" signature="5752:5872" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SqlDataSource/SqlDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="51" column="15" lean-forward="true" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
-          <folding>
-            <marker date="1565440770576" expanded="true" signature="54:2421" ph="{...}" />
-            <marker date="1565440770576" expanded="false" signature="67:288" ph="..." />
-            <marker date="1565440770576" expanded="true" signature="334:2419" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="692:806" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="918:1054" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="1189:1434" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="1444:1569" ph="/// ... " />
-            <marker date="1565440770576" expanded="true" signature="1672:2413" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="1866:2366" ph="{...}" />
-            <marker date="1565440770576" expanded="true" signature="2172:2258" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="100" selection-start-line="14" selection-start-column="100" selection-end-line="14" selection-end-column="120" />
-          <folding>
-            <marker date="1565440802073" expanded="true" signature="67:519" ph="{...}" />
-            <marker date="1565440802073" expanded="true" signature="80:188" ph="..." />
-            <marker date="1565440802073" expanded="true" signature="306:517" ph="{...}" />
-            <marker date="1565440802073" expanded="true" signature="369:511" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="61" column="69" lean-forward="true" selection-start-line="61" selection-start-column="69" selection-end-line="61" selection-end-column="69" />
-          <folding>
-            <marker date="1565441324049" expanded="true" signature="6:44" ph="..." />
-            <marker date="1565441324049" expanded="true" signature="89:2798" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="102:293" ph="..." />
-            <marker date="1565441324049" expanded="true" signature="342:2796" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="472:538" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="971:1046" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="1158:1266" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="1401:1618" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="1697:2790" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="1973:2743" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="2262:2729" ph="{...}" />
-            <marker date="1565441324049" expanded="true" signature="2395:2709" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSource.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="38" column="67" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="67" />
-          <folding>
-            <marker date="1565441420957" expanded="true" signature="76:2003" ph="{...}" />
-            <marker date="1565441420957" expanded="false" signature="89:244" ph="..." />
-            <marker date="1565441420957" expanded="true" signature="295:2001" ph="{...}" />
-            <marker date="1565441420957" expanded="true" signature="535:620" ph="{...}" />
-            <marker date="1565441420957" expanded="true" signature="732:850" ph="{...}" />
-            <marker date="1565441420957" expanded="true" signature="984:1211" ph="{...}" />
-            <marker date="1565441420957" expanded="true" signature="1304:1995" ph="{...}" />
-            <marker date="1565441420957" expanded="true" signature="1767:1983" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
-          <folding>
-            <marker date="1565441391697" expanded="true" signature="6:56" ph="..." />
-            <marker date="1565441391697" expanded="true" signature="103:847" ph="{...}" />
-            <marker date="1565441391697" expanded="true" signature="116:224" ph="..." />
-            <marker date="1565441391697" expanded="true" signature="344:845" ph="{...}" />
-            <marker date="1565441391697" expanded="true" signature="404:839" ph="{...}" />
-            <marker date="1565441391697" expanded="true" signature="651:827" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMapping.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1799">
-          <caret line="110" column="100" lean-forward="true" selection-start-line="110" selection-start-column="100" selection-end-line="110" selection-end-column="100" />
-          <folding>
-            <marker date="1565441516548" expanded="true" signature="73:7220" ph="{...}" />
-            <marker date="1565441516548" expanded="false" signature="86:191" ph="..." />
-            <marker date="1565441516548" expanded="true" signature="197:277" ph="/// the core relation mapping functionality ... " />
-            <marker date="1565441516548" expanded="true" signature="319:7218" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="334:841" ph="/// Get all related id for the supplied criteria ... " />
-            <marker date="1565441516548" expanded="true" signature="979:2983" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="1101:2928" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="1279:2914" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="1886:2204" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="2229:2793" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="2555:2771" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="2993:3484" ph="/// ... " />
-            <marker date="1565441516548" expanded="true" signature="3635:7212" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="3801:7202" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="4382:4702" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="4723:5282" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="5051:5264" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="5534:6850" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="5652:6832" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="5945:6810" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="6134:6515" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="6971:7188" ph="{...}" />
-            <marker date="1565441516548" expanded="true" signature="7051:7170" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="22" column="9" lean-forward="true" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
-          <folding>
-            <marker date="1565441522112" expanded="true" signature="42:1087" ph="{...}" />
-            <marker date="1565441522112" expanded="false" signature="55:190" ph="..." />
-            <marker date="1565441522112" expanded="true" signature="307:1085" ph="{...}" />
-            <marker date="1565441522112" expanded="true" signature="385:761" ph="{...}" />
-            <marker date="1565441522112" expanded="true" signature="573:749" ph="{...}" />
-            <marker date="1565441522112" expanded="true" signature="949:1079" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingComment.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-340">
-          <caret line="63" column="13" lean-forward="true" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <marker date="1565441597254" expanded="true" signature="73:4920" ph="{...}" />
-            <marker date="1565441597254" expanded="false" signature="86:198" ph="..." />
-            <marker date="1565441597254" expanded="true" signature="204:306" ph="/// Represents the data stored in the comment field of a relation ... " />
-            <marker date="1565441597254" expanded="true" signature="346:4918" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="361:458" ph="/// The property alias of the picker using relations ... " />
-            <marker date="1565441597254" expanded="true" signature="526:620" ph="/// Used to identify a specific dataType instance ... " />
-            <marker date="1565441597254" expanded="true" signature="686:762" ph="/// Used to identify a dataType ... " />
-            <marker date="1565441597254" expanded="true" signature="834:1129" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
-            <marker date="1565441597254" expanded="true" signature="1206:2767" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="1518:1657" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="1674:2309" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="1802:1951" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="1972:2295" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="2115:2277" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="2348:2552" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="2569:2757" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="2777:2977" ph="/// Initialize a new instance of &lt;see cref=&quot;RelationMappingComment&quot;/&gt; ... " />
-            <marker date="1565441597254" expanded="true" signature="3033:3871" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="3096:3861" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="3130:3636" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="3675:3847" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="3881:4071" ph="/// Helper to determine if the property is inside an Archetype ... " />
-            <marker date="1565441597254" expanded="true" signature="4109:4201" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="4271:4499" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="4297:4413" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="4444:4489" ph="{...}" />
-            <marker date="1565441597254" expanded="true" signature="4509:4639" ph="/// Get the serialized XML comment ... " />
-            <marker date="1565441597254" expanded="true" signature="4676:4911" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Components/nuPickerCompontent.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
-          <folding>
-            <marker date="1565435225174" expanded="true" signature="30:83" ph="{...}" />
-            <marker date="1565435225174" expanded="true" signature="68:81" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Components/EmbeddedResourceCompontent.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="499">
-          <caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
-          <folding>
-            <marker date="1565435304332" expanded="true" signature="6:181" ph="..." />
-            <marker date="1565435304332" expanded="true" signature="213:1510" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="307:1508" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="441:500" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="532:601" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="720:1400" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="1023:1156" ph="{...}" />
-            <marker date="1565435304332" expanded="true" signature="1433:1502" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Components/CacheInvalidationComponent.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="56" column="68" lean-forward="true" selection-start-line="56" selection-start-column="68" selection-end-line="56" selection-end-column="95" />
-          <folding>
-            <marker date="1565441918806" expanded="false" signature="6:208" ph="..." />
-            <marker date="1565441918806" expanded="true" signature="240:2364" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="334:2362" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="545:659" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="690:759" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="878:1163" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="1196:1265" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="1359:1539" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="1637:1819" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="1916:2085" ph="{...}" />
-            <marker date="1565441918806" expanded="true" signature="2186:2356" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Components/RelationMappingComponent.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1530">
-          <caret line="90" column="69" lean-forward="true" selection-start-line="90" selection-start-column="69" selection-end-line="90" selection-end-column="69" />
-          <folding>
-            <marker date="1565441879547" expanded="true" signature="6:361" ph="..." />
-            <marker date="1565441879547" expanded="true" signature="393:5226" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="437:5224" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="648:762" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="793:862" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="981:1184" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="1217:1286" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="1379:1458" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="1546:1625" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="1716:1795" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="1805:1988" ph="/// combined event for content / media / member ... " />
-            <marker date="1565441879547" expanded="true" signature="2073:5218" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="2147:5208" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="2368:5194" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="3027:5176" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="3214:4639" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="3299:3429" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="3462:4613" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="3952:4121" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="4187:4352" ph="{...}" />
-            <marker date="1565441879547" expanded="true" signature="4419:4583" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/nuPickerComposer.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="61" lean-forward="true" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
-          <folding>
-            <marker date="1565441897395" expanded="true" signature="6:77" ph="..." />
-            <marker date="1565441897395" expanded="true" signature="98:550" ph="{...}" />
-            <marker date="1565441897395" expanded="true" signature="200:548" ph="{...}" />
-            <marker date="1565441897395" expanded="true" signature="259:542" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-102">
-          <caret line="96" column="81" selection-start-line="96" selection-start-column="81" selection-end-line="96" selection-end-column="81" />
-          <folding>
-            <marker date="1565440742160" expanded="true" signature="8:216" ph="..." />
-            <marker date="1565440742160" expanded="true" signature="255:5216" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="268:348" ph="..." />
-            <marker date="1565440742160" expanded="true" signature="354:477" ph="/// This class exists so as to be able to save xml direclty into the Umbraco xml cache ... " />
-            <marker date="1565440742160" expanded="true" signature="544:5214" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="590:758" ph="/// reconstruct values from original (default) property value editor ... " />
-            <marker date="1565440742160" expanded="true" signature="853:1044" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="1118:1235" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="1245:1573" ph="/// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData ... " />
-            <marker date="1565440742160" expanded="true" signature="1698:1989" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="1817:1891" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="1922:1979" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="2088:3221" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="2307:2558" ph="/* mandatory and regex validators cannot be part of valueEditor.Validators because they ... */" />
-            <marker date="1565440742160" expanded="true" signature="2585:2789" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="2934:3142" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="3231:3331" ph="/// A collection of validators for the pre value editor ... " />
-            <marker date="1565440742160" expanded="true" signature="3448:3577" ph="/// Gets the validator used to validate the special property type -level &quot;required&quot;. ... " />
-            <marker date="1565440742160" expanded="true" signature="3672:3799" ph="/// Gets the validator used to validate the special property type -level &quot;format&quot;. ... " />
-            <marker date="1565440742160" expanded="true" signature="3973:4049" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="4180:4256" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="4432:4508" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="4620:4696" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="4812:4888" ph="{...}" />
-            <marker date="1565440742160" expanded="true" signature="4975:5083" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs b/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
index 7ed81e2..1f17508 100644
--- a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
@@ -1,14 +1,19 @@
 
+using Umbraco.Core.Logging;
+using Umbraco.Web.Models.ContentEditing;
+
 namespace nuPickers.PropertyEditors
 {
     using nuPickers.Shared.SaveFormat;
     using Umbraco.Core.PropertyEditors;
 
-    public abstract class BasePropertyEditor : PropertyEditor
+    public abstract class BasePropertyEditor : DataEditor
     {
-        protected override PropertyValueEditor CreateValueEditor()
+        protected override IDataValueEditor CreateValueEditor()  => new SaveFormatPropertyValueEditor(Attribute);
+
+
+        protected BasePropertyEditor(ILogger logger, EditorType type = EditorType.PropertyValue) : base(logger, type)
         {
-            return new SaveFormatPropertyValueEditor(base.CreateValueEditor());
         }
     }
 }
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
index d99e32a..36e092f 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
@@ -3,7 +3,7 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class DotNetCheckBoxPickerPreValueEditor : IConfigurationEditor
+    internal class DotNetCheckBoxPickerPreValueEditor : ConfigurationEditor
     {
         [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
index 667a78b..7464722 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
@@ -4,12 +4,12 @@ namespace nuPickers.PropertyEditors.EnumDropDownPicker
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class EnumDropDownPickerPreValueEditor : PreValueEditor
+    internal class EnumDropDownPickerPreValueEditor : ConfigurationEditor
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
index c014214..bad8715 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.EnumDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -20,11 +22,12 @@
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumDropDownPickerPropertyEditor : BasePropertyEditor
+    public class EnumDropDownPickerPropertyEditor  : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerPreValueEditor();
+
+        public EnumDropDownPickerPropertyEditor(ILogger logger, EditorType type = EditorType.PropertyValue) : base(logger, type)
         {
-            return new EnumDropDownPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 10d7bf3..597f2bf 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -1,4 +1,8 @@
 
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
+
 namespace nuPickers.Shared.CustomLabel
 {
     using nuPickers.Shared.Editor;
@@ -40,7 +44,7 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
             this.PropertyAlias = propertyAlias;
 
             // the macro requires a published context to run in
-            Node currentNode = uQuery.GetNode(contextId);
+            IPublishedContent currentNode = Current.UmbracoContext.ContentCache.GetById(contextId);
             if (currentNode != null)
             {
                 // current page is published so use this as the macro context
@@ -50,7 +54,7 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
             else
             {
                  // fallback nd find first published page to use as host
-                 Node contextNode = uQuery.GetNodesByXPath(string.Concat("descendant::*[@parentID = ", uQuery.RootNodeId, "]")).FirstOrDefault();
+                 IPublishedContent contextNode = Current.UmbracoContext.ContentCache.GetSingleByXPath(string.Concat("descendant::*[@parentID = ", Current.Services.ContentService.GetRootContent().FirstOrDefault(), "]"));
                  if (contextNode != null)
                  {
                      HttpContext.Current.Items["pageID"] = contextNode.Id;
@@ -96,15 +100,15 @@ private string ProcessMacro(string key, string label, string keys, int counter,
             {
                 Macro macro = new Macro() { Alias = this.MacroAlias };
 
-                macro.MacroAttributes.Add("contextId".ToLower(), this.ContextId);
-                macro.MacroAttributes.Add("propertyAlias".ToLower(), this.PropertyAlias);
+                macro.Properties.Add(new MacroProperty("contextId".ToLower(), this.ContextId.ToString()));
+                macro.Properties.Add(new MacroProperty("propertyAlias".ToLower(), this.PropertyAlias));
 
-                macro.MacroAttributes.Add("key", key);
-                macro.MacroAttributes.Add("label", label);
+                macro.Properties.Add("key", key);
+                macro.Properties.Add("label", label);
 
-                macro.MacroAttributes.Add("keys", keys);
-                macro.MacroAttributes.Add("counter", counter);
-                macro.MacroAttributes.Add("total", total);
+                macro.Properties.Add("keys", keys);
+                macro.Properties.Add("counter", counter);
+                macro.Properties.Add("total", total);
 
                 label = this.RenderToString(macro);
             }
diff --git a/source/nuPickers/Shared/Editor/Editor.cs b/source/nuPickers/Shared/Editor/Editor.cs
index 0bdd157..3ea8540 100644
--- a/source/nuPickers/Shared/Editor/Editor.cs
+++ b/source/nuPickers/Shared/Editor/Editor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.Editor
+using System.Web.UI;
+
+namespace nuPickers.Shared.Editor
 {
     using DataSource;
     using nuPickers.Shared.CustomLabel;
diff --git a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
index cd549c9..c6a97fb 100644
--- a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
+++ b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
@@ -1,4 +1,8 @@
-namespace nuPickers.Shared.EnumDataSource
+using System.Collections;
+using System.Web.UI;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.EnumDataSource
 {
     using DataSource;
     using nuPickers.Shared.Editor;
@@ -16,28 +20,28 @@ public class EnumDataSource : IDataSource
 
         bool IDataSource.HandledTypeahead { get { return false; } }
 
-        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
+        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
             return this.GetEditorDataItems();
         }
 
-        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
+        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
             return this.GetEditorDataItems().Where(x => keys.Contains(x.Key));
         }
 
-        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
+        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
         {
             var editorDataItems = this.GetEditorDataItems();
 
             total = editorDataItems.Count();
-            
+
             return editorDataItems.Skip(pageMarker.Skip).Take(pageMarker.Take);
         }
 
-        private IEnumerable<EditorDataItem> GetEditorDataItems()
+        private IEnumerable<DataEditor> GetEditorDataItems()
         {
-            List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
+            List<DataEditor> editorDataItems = new List<DataEditor>();
 
             Type enumType = Helper.GetAssembly(this.AssemblyName).GetType(this.EnumName);
 
@@ -50,7 +54,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems()
 
                 foreach(CustomAttributeData customAttributeData in CustomAttributeData.GetCustomAttributes(fieldInfo))
                 {
-                    if (customAttributeData.Constructor.DeclaringType != null 
+                    if (customAttributeData.Constructor.DeclaringType != null
                         && customAttributeData.Constructor.DeclaringType.Name == "EnumDataSourceAttribute"
                         && customAttributeData.NamedArguments != null)
                     {
@@ -76,11 +80,23 @@ private IEnumerable<EditorDataItem> GetEditorDataItems()
 
                 if (enabled)
                 {
-                    editorDataItems.Add(new EditorDataItem() { Key = key, Label = label });
+                    editorDataItems.Add(new DataEditor( { Key = key, Label = label });
                 }
             }
 
             return editorDataItems;
         }
+
+        public DataSourceView GetView(string viewName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICollection GetViewNames()
+        {
+            throw new NotImplementedException();
+        }
+
+        public event EventHandler DataSourceChanged;
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
index db06e6c..5c417a9 100644
--- a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
+++ b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.Composing;
+using System.Web.UI;
+using Umbraco.Core.Composing;
 
 namespace nuPickers.Shared.RelationDataSource
 {
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
index 65aa88a..085f536 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
@@ -1,6 +1,9 @@
-namespace nuPickers.Shared.SaveFormat
+using ClientDependency.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.Composing;
+
+namespace nuPickers.Shared.SaveFormat
 {
-    using Editor;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
     using System.Collections.Generic;
@@ -9,6 +12,8 @@
 
     internal static class SaveFormat
     {
+
+
         /// <summary>
         /// Ignore the specified saved format, and try and restore collection directly from the supplied string value
         /// </summary>
@@ -26,11 +31,11 @@ internal static IEnumerable<string> GetKeys(string value)
         /// <param name="value">the saved value as a string</param>
         /// <param name="editorDataItems"></param>
         /// <returns>bool flag to indicate whether the items could be created from the savedValue supplied</returns>
-        internal static bool TryGetDataEditorItems(string value, out IEnumerable<EditorDataItem> editorDataItems)
+        internal static bool TryGetDataEditorItems(string value, out IEnumerable<IDataEditor> editorDataItems)
         {
             editorDataItems = SaveFormat.GetKeyValuePairs(value)
                                         .Where(x => x.Value != null)
-                                        .Select(x => new EditorDataItem() { Key = x.Key, Label = x.Value });
+                                        .Select(x => new DataEditor(Current.Logger,new EditorType()));
 
             return editorDataItems.Count() > 0;
         }
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
index da1e8e1..73bbf62 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
@@ -1,9 +1,9 @@
-
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json;
+using nuPickers.Validators;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
@@ -17,7 +17,7 @@ namespace nuPickers.Shared.SaveFormat
     /// <summary>
     /// This class exists so as to be able to save xml direclty into the Umbraco xml cache
     /// </summary>
-    public class SaveFormatPropertyValueEditor  : IDataValueEditor
+    public class SaveFormatPropertyValueEditor : DataValueEditor
     {
         private string _view;
 
@@ -30,111 +30,12 @@ public SaveFormatPropertyValueEditor(DataEditorAttribute propertyValueEditor) :
             this.HideLabel = propertyValueEditor.HideLabel;
             this.View = propertyValueEditor.View;
             this.ValueType = propertyValueEditor.ValueType;
-
-        }
-        public SaveFormatPropertyValueEditor() // for tests, and manifest
-        {
-            ValueType = ValueTypes.String;
-            Validators = new List<IValueValidator>();
-        }
-
-        /// <summary>
-        /// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData
-        /// </summary>
-        /// <param name="property"></param>
-        /// <param name="propertyType"></param>
-        /// <param name="dataTypeService"></param>
-        /// <returns></returns>
-        public override XNode ConvertDbToXml(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
-        {
-            string value = this.ConvertDbToString(property, propertyType, dataTypeService);
-
-            try
-            {
-                return XElement.Parse(value);
-            }
-            catch
-            {
-                return new XCData(value);
-            }
         }
 
-        public IEnumerable<ValidationResult> Validate(object value, bool required, string format)
+        public SaveFormatPropertyValueEditor()  // for tests, and manifest
         {
-            List<ValidationResult> results = null;
-            var r = Validators.SelectMany(v => v.Validate(value, ValueType, Configuration)).ToList();
-            if (r.Any()) { results = r; }
-
-            // mandatory and regex validators cannot be part of valueEditor.Validators because they
-            // depend on values that are not part of the configuration, .Mandatory and .ValidationRegEx,
-            // so they have to be explicitly invoked here.
-
-            if (required)
-            {
-                r = RequiredValidator.ValidateRequired(value, ValueType).ToList();
-                if (r.Any()) { if (results == null) results = r; else results.AddRange(r); }
-            }
-
-            var stringValue = value?.ToString();
-            if (!string.IsNullOrWhiteSpace(format) && !string.IsNullOrWhiteSpace(stringValue))
-            {
-                r = FormatValidator.ValidateFormat(value, ValueType, format).ToList();
-                if (r.Any()) { if (results == null) results = r; else results.AddRange(r); }
-            }
-
-            return results ?? Enumerable.Empty<ValidationResult>();
         }
 
-        /// <summary>
-        /// A collection of validators for the pre value editor
-        /// </summary>
-        [JsonProperty("validation")]
-        public List<IValueValidator> Validators { get; private set; }
-
-        /// <summary>
-        /// Gets the validator used to validate the special property type -level "required".
-        /// </summary>
-        public virtual IValueRequiredValidator RequiredValidator => new Requiredv();
 
-        /// <summary>
-        /// Gets the validator used to validate the special property type -level "format".
-        /// </summary>
-        public virtual IValueFormatValidator FormatValidator => new RegexValidator();
-
-        public object FromEditor(ContentPropertyData editorValue, object currentValue)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService,
-            ILocalizationService localizationService, bool published)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        [JsonProperty("view", Required = Required.Always)]
-        public string View
-        {
-            get => _view;
-            set => _view = IOHelper.ResolveVirtualUrl(value);
-        }
-        public string ValueType { get; set; }
-        public bool IsReadOnly { get; }
-        public bool HideLabel { get; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Validators/RegexValidator.cs b/source/nuPickers/Validators/RegexValidator.cs
new file mode 100644
index 0000000..b54d0dd
--- /dev/null
+++ b/source/nuPickers/Validators/RegexValidator.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace nuPickers.Validators
+{
+    public class RegexValidator : IValueFormatValidator, IManifestValueValidator
+    {
+        private readonly ILocalizedTextService _textService;
+        private string _regex;
+
+        /// <inheritdoc cref="IManifestValueValidator.ValidationName"/>
+        public string ValidationName => "Regex";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexValidator"/> class.
+        /// </summary>
+        /// <remarks>Use this constructor when the validator is used as an <see cref="IValueFormatValidator"/>,
+        /// and the regular expression is supplied at validation time. This constructor is also used when
+        /// the validator is used as an <see cref="IManifestValueValidator"/> and the regular expression
+        /// is supplied via the <see cref="Configuration"/> method.</remarks>
+        public RegexValidator() : this(Current.Services.TextService, null)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexValidator"/> class.
+        /// </summary>
+        /// <remarks>Use this constructor when the validator is used as an <see cref="IValueValidator"/>,
+        /// and the regular expression must be supplied when the validator is created.</remarks>
+        public RegexValidator(ILocalizedTextService textService, string regex)
+        {
+            _textService = textService;
+            _regex = regex;
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration, when parsed as <see cref="IManifestValueValidator"/>.
+        /// </summary>
+        public string Configuration
+        {
+            get => _regex;
+            set
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                    throw new ArgumentNullOrEmptyException(nameof(value));
+                _regex = value;
+            }
+        }
+
+        /// <inheritdoc cref="IValueValidator.Validate"/>
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+        {
+            if (_regex == null)
+                throw new InvalidOperationException("The validator has not been configured.");
+
+            return ValidateFormat(value, valueType, _regex);
+        }
+
+        /// <inheritdoc cref="IValueFormatValidator.ValidateFormat"/>
+        public IEnumerable<ValidationResult> ValidateFormat(object value, string valueType, string format)
+        {
+            if (string.IsNullOrWhiteSpace(format)) throw new ArgumentNullOrEmptyException(nameof(format));
+            if (value == null || !new Regex(format).IsMatch(value.ToString()))
+                yield return new ValidationResult(_textService.Localize("validation", "invalidPattern"), new[] { "value" });
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/Validators/RequiredValidator.cs b/source/nuPickers/Validators/RequiredValidator.cs
new file mode 100644
index 0000000..1c2e4ff
--- /dev/null
+++ b/source/nuPickers/Validators/RequiredValidator.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace nuPickers.Validators
+{
+    public class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
+    {
+        private readonly ILocalizedTextService _textService;
+
+        public RequiredValidator() : this(Current.Services.TextService)
+        {
+        }
+
+        public RequiredValidator(ILocalizedTextService textService)
+        {
+            _textService = textService;
+        }
+
+        /// <inheritdoc cref="IManifestValueValidator.ValidationName"/>
+        public string ValidationName => "Required";
+
+        /// <inheritdoc cref="IValueValidator.Validate"/>
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+        {
+            return ValidateRequired(value, valueType);
+        }
+
+        /// <inheritdoc cref="IValueRequiredValidator.ValidateRequired"/>
+        public IEnumerable<ValidationResult> ValidateRequired(object value, string valueType)
+        {
+            if (value == null)
+            {
+                yield return new ValidationResult(_textService.Localize("validation", "invalidNull"), new[] {"value"});
+                yield break;
+            }
+
+            if (valueType.InvariantEquals(ValueTypes.Json))
+            {
+                if (DetectIsEmptyJson(value.ToString()))
+                    yield return new ValidationResult(_textService.Localize("validation", "invalidEmpty"), new[] { "value" });
+                yield break;
+            }
+
+            if (value.ToString().IsNullOrWhiteSpace())
+            {
+                yield return new ValidationResult(_textService.Localize("validation", "invalidEmpty"), new[] { "value" });
+            }
+        }
+        static bool DetectIsEmptyJson( string input)
+        {
+            return ((IList) JsonEmpties).Contains(Whitespace.Value.Replace(input, string.Empty));
+        }
+        static readonly string[] JsonEmpties = { "[]", "{}" };
+        static readonly Lazy<Regex> Whitespace = new Lazy<Regex>(() => new Regex(@"\s+", RegexOptions.Compiled));
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 2a884b9..7f75bf0 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -327,132 +327,32 @@
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPreValueEditor.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
-    <Compile Include="PropertyEditors\SqlLabels\SqlLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlLabels\SqlLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPagedListPicker\SqlPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPagedListPicker\SqlPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlLabels\XmlLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlLabels\XmlLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPagedListPicker\XmlPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPagedListPicker\XmlPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlTypeaheadListPicker\XmlTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlTypeaheadListPicker\XmlTypeaheadListPickerPropertyEditor.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PickerPropertyValueConverter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Shared\DataSource\DataSource.cs" />
-    <Compile Include="Shared\DataSource\DataSourceApiResponse.cs" />
-    <Compile Include="Shared\DataSource\IDataSource.cs" />
-    <Compile Include="Shared\DataSource\DataSourceApiController.cs" />
-    <Compile Include="Shared\DotNetDataSource\DotNetDataSource.cs" />
-    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceApiController.cs" />
-    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceAttribute.cs" />
-    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceProperty.cs" />
-    <Compile Include="Shared\DotNetDataSource\IDotNetDataSource.cs" />
-    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourceKeyed.cs" />
-    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourcePaged.cs" />
-    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourceTypeahead.cs" />
     <Compile Include="Shared\Editor\Editor.cs" />
+    <Compile Include="Shared\Editor\EditorDataItem.cs" />
     <Compile Include="Shared\EnumDataSource\EnumExtensions.cs" />
-    <Compile Include="Shared\JsonDataSource\JsonDataSource.cs" />
-    <Compile Include="Shared\LuceneDataSource\LuceneDataSource.cs" />
     <Compile Include="Shared\LuceneDataSource\LuceneDataSourceApiController.cs" />
     <Compile Include="Shared\Paging\PageMarker.cs" />
-    <Compile Include="Shared\RelationDataSource\RelationDataSource.cs" />
-    <Compile Include="Shared\RelationDataSource\RelationDataSourceApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMapping.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingComment.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormatPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlCheckBoxPicker\XmlCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlCheckBoxPicker\XmlCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlDropDownPicker\XmlDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlDropDownPicker\XmlDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPrefetchListPicker\XmlPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPrefetchListPicker\XmlPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlRadioButtonPicker\XmlRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlRadioButtonPicker\XmlRadioButtonPickerPropertyEditor.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSource.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSourceApiController.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSourceAttribute.cs" />
-    <Compile Include="Shared\Editor\EditorDataItem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
-    <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingApiController.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormat.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSource.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSourceApiController.cs" />
-    <Compile Include="Shared\TypeaheadListPicker\TypeaheadListPicker.cs" />
-    <Compile Include="Shared\XmlDataSource\XmlDataSource.cs" />
+    <Compile Include="Validators\RegexValidator.cs" />
+    <Compile Include="Validators\RequiredValidator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -462,13 +362,10 @@
     <EmbeddedResource Include="Shared\SaveFormat\SaveFormatConfigController.js" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerConfig.html" />
     <EmbeddedResource Include="Shared\ListPicker\ListPickerEditor.css" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerEditor.html" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerEditorController.js" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\HiddenConstant\HiddenConstantConfig.html" />
@@ -477,13 +374,6 @@
     <EmbeddedResource Include="Shared\DropDownPicker\DropDownPickerEditor.html" />
     <EmbeddedResource Include="Shared\DropDownPicker\DropDownPickerEditorController.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfig.html" />
-    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\SqlDataSource\SqlDataSourceConfig.html" />
     <EmbeddedResource Include="Shared\SqlDataSource\SqlDataSourceConfigController.js" />
@@ -521,24 +411,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\PropertyEditor\PropertyEditorConfig.css" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\DataSource\DataSourceResource.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\ListPicker\ListPickerEditorDirectives.js" />
   </ItemGroup>
@@ -551,15 +423,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\ListPicker\ListPickerSelectedPartial.html" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\RelationMapping\RelationMappingResource.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\Editor\EditorResource.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\JsonDataSource\JsonDataSourceConfig.html" />
   </ItemGroup>
@@ -570,16 +436,6 @@
     <EmbeddedResource Include="Shared\LuceneDataSource\LuceneDataSourceConfig.html" />
     <EmbeddedResource Include="Shared\LuceneDataSource\LuceneDataSourceConfigController.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
-    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\Labels\LabelsConfigController.js" />
   </ItemGroup>
@@ -597,6 +453,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\PagedListPicker\PagedListPickerEditor.css" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Shared\Editor\EditorResource.js" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

From 768555f9c47b23e3a5745b5a5145e66cd8baf00b Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 00:00:53 +0100
Subject: [PATCH 04/43] Migrated enumpicker

---
 .../EmbeddedResource/EmbeddedResource.cs      |   2 +-
 .../EnumCheckBoxPickerPreValueEditor.cs       |  12 +-
 .../EnumDropDownPickerConfiguration.cs        |  17 ++
 .../EnumDropDownPickerConfigurationEditor.cs  | 148 ++++++++++++++++++
 .../EnumDropDownPickerPreValueEditor.cs       |  15 --
 .../EnumDropDownPickerPropertyEditor.cs       |   5 +-
 .../Shared/CustomLabel/CustomLabel.cs         |   9 +-
 .../CustomLabel/CustomLabelApiController.cs   |  11 +-
 .../Shared/DataSource/IDataSource.cs          |   4 +-
 source/nuPickers/Shared/Editor/Editor.cs      |  11 +-
 .../nuPickers/Shared/Editor/EditorDataItem.cs |   2 +-
 .../Shared/EnumDataSource/EnumDataSource.cs   |  30 +---
 .../nuPickers/Shared/SaveFormat/SaveFormat.cs |   9 +-
 .../Shared/XmlDataSource/XmlDataSource.cs     |   4 +-
 source/nuPickers/nuPickerComposer.cs          |   4 +
 source/nuPickers/nuPickers.csproj             |  36 ++++-
 16 files changed, 250 insertions(+), 69 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs

diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index 6ddb2c1..fa8d3ff 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -15,6 +15,6 @@ internal static class EmbeddedResource
         /// <summary>
         /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = ".nu";
+        internal const string FILE_EXTENSION = "";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
index a76107e..4d70f29 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
@@ -3,21 +3,21 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class EnumCheckBoxPickerPreValueEditor : PreValueEditor
+    internal class EnumCheckBoxPickerPreValueEditor : ConfigurationEditor
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..b2dab3a
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
@@ -0,0 +1,17 @@
+
+namespace nuPickers.PropertyEditors.EnumDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    public class EnumDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..2b8ff05
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,148 @@
+
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+
+namespace nuPickers.PropertyEditors.EnumDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class EnumDropDownPickerConfigurationEditor : ConfigurationEditor<EnumDropDownPickerConfiguration>
+    {
+        public EnumDropDownPickerConfigurationEditor()
+        {
+
+        }
+        public override Dictionary<string, object> ToConfigurationEditor(EnumDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumDropDownPickerConfiguration configuration)
+        {
+            var output = new EnumDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 7464722..0000000
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumDropDownPickerPreValueEditor : ConfigurationEditor
-    {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
index bad8715..3ebe095 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
@@ -1,4 +1,5 @@
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
 
 namespace nuPickers.PropertyEditors.EnumDropDownPicker
 {
@@ -24,9 +25,9 @@ namespace nuPickers.PropertyEditors.EnumDropDownPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class EnumDropDownPickerPropertyEditor  : DataEditor
     {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerPreValueEditor();
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerConfigurationEditor();
 
-        public EnumDropDownPickerPropertyEditor(ILogger logger, EditorType type = EditorType.PropertyValue) : base(logger, type)
+        public EnumDropDownPickerPropertyEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 597f2bf..2a2aa39 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -13,9 +13,6 @@ namespace nuPickers.Shared.CustomLabel
     using System.Text;
     using System.Web;
     using System.Web.UI;
-    using umbraco;
-    using umbraco.NodeFactory;
-    using umbraco.presentation.templateControls;
 
     internal class CustomLabel
     {
@@ -99,7 +96,7 @@ private string ProcessMacro(string key, string label, string keys, int counter,
             if (!string.IsNullOrWhiteSpace(this.MacroAlias) && this.HasMacroContext)
             {
                 Macro macro = new Macro() { Alias = this.MacroAlias };
-
+/*
                 macro.Properties.Add(new MacroProperty("contextId".ToLower(), this.ContextId.ToString()));
                 macro.Properties.Add(new MacroProperty("propertyAlias".ToLower(), this.PropertyAlias));
 
@@ -109,7 +106,7 @@ private string ProcessMacro(string key, string label, string keys, int counter,
                 macro.Properties.Add("keys", keys);
                 macro.Properties.Add("counter", counter);
                 macro.Properties.Add("total", total);
-
+*/
                 label = this.RenderToString(macro);
             }
 
@@ -126,7 +123,7 @@ private string RenderToString(Macro macro)
             using (StringWriter stringWriter = new StringWriter(stringBuilder))
             using (HtmlTextWriter htmlTextWriter = new HtmlTextWriter(stringWriter))
             {
-                macro.RenderControl(htmlTextWriter);
+             //   macro.RenderControl(htmlTextWriter);
             }
 
             return stringBuilder.ToString();
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
index 60dd2a0..7f318bc 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
@@ -1,8 +1,11 @@
-namespace nuPickers.Shared
+using System.Linq;
+using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
+
+namespace nuPickers.Shared
 {
     using System.Collections.Generic;
-    using System.Linq;
-    using umbraco.cms.businesslogic.macro;
+
     using Umbraco.Web.Editors;
     using Umbraco.Web.Mvc;
 
@@ -12,7 +15,7 @@ public class CustomLabelApiController : UmbracoAuthorizedJsonController
         public IEnumerable<object> GetMacros()
         {
             //using legacy api as no method on Umbraco.Core.Services.MacroSerivce to get all macros
-            return Macro.GetAll()
+            return Current.Services.MacroService.GetAll()
                         .Select(x => new
                         {
                             name = x.Name,
diff --git a/source/nuPickers/Shared/DataSource/IDataSource.cs b/source/nuPickers/Shared/DataSource/IDataSource.cs
index a46b001..9fe2d17 100644
--- a/source/nuPickers/Shared/DataSource/IDataSource.cs
+++ b/source/nuPickers/Shared/DataSource/IDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.DataSource
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.DataSource
 {
     using nuPickers.Shared.Editor;
     using Paging;
diff --git a/source/nuPickers/Shared/Editor/Editor.cs b/source/nuPickers/Shared/Editor/Editor.cs
index 3ea8540..8509fd1 100644
--- a/source/nuPickers/Shared/Editor/Editor.cs
+++ b/source/nuPickers/Shared/Editor/Editor.cs
@@ -1,4 +1,5 @@
 using System.Web.UI;
+using Umbraco.Core.PropertyEditors;
 
 namespace nuPickers.Shared.Editor
 {
@@ -22,11 +23,11 @@ internal static class Editor
         /// <param name="customLabelMacro">an optional macro to use for custom labels</param>
         /// <param name="typeahead">optional typeahead text to filter down on items returned</param>
         /// <returns>a collection of <see cref="EditorDataItem"/></returns>
-        internal static IEnumerable<EditorDataItem> GetEditorDataItems(                                                        
+        internal static IEnumerable<EditorDataItem> GetEditorDataItems(
                                                         int currentId,
                                                         int parentId,
                                                         string propertyAlias,
-                                                        IDataSource dataSource, 
+                                                        IDataSource dataSource,
                                                         string customLabelMacro,
                                                         string typeahead = null)
         {
@@ -114,9 +115,9 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
             if (dataSource != null)
             {
                 editorDataItems = dataSource.GetEditorDataItems(
-                                                currentId, 
-                                                parentId, 
-                                                new PageMarker(itemsPerPage, page), 
+                                                currentId,
+                                                parentId,
+                                                new PageMarker(itemsPerPage, page),
                                                 out total);
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
diff --git a/source/nuPickers/Shared/Editor/EditorDataItem.cs b/source/nuPickers/Shared/Editor/EditorDataItem.cs
index 254781a..5ed788d 100644
--- a/source/nuPickers/Shared/Editor/EditorDataItem.cs
+++ b/source/nuPickers/Shared/Editor/EditorDataItem.cs
@@ -9,7 +9,7 @@ public class EditorDataItem
     {
         [JsonProperty("key")]
         public string Key { get; set; }
-     
+
         [JsonProperty("label")]
         public string Label { get; set; }
     }
diff --git a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
index c6a97fb..6ca42f6 100644
--- a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
+++ b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
@@ -1,8 +1,4 @@
-using System.Collections;
-using System.Web.UI;
-using Umbraco.Core.PropertyEditors;
-
-namespace nuPickers.Shared.EnumDataSource
+namespace nuPickers.Shared.EnumDataSource
 {
     using DataSource;
     using nuPickers.Shared.Editor;
@@ -20,17 +16,17 @@ public class EnumDataSource : IDataSource
 
         bool IDataSource.HandledTypeahead { get { return false; } }
 
-        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
+        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
             return this.GetEditorDataItems();
         }
 
-        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
+        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
             return this.GetEditorDataItems().Where(x => keys.Contains(x.Key));
         }
 
-        IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
+        IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
         {
             var editorDataItems = this.GetEditorDataItems();
 
@@ -39,9 +35,9 @@ IEnumerable<DataEditor> IDataSource.GetEditorDataItems(int currentId, int parent
             return editorDataItems.Skip(pageMarker.Skip).Take(pageMarker.Take);
         }
 
-        private IEnumerable<DataEditor> GetEditorDataItems()
+        private IEnumerable<EditorDataItem> GetEditorDataItems()
         {
-            List<DataEditor> editorDataItems = new List<DataEditor>();
+            List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
 
             Type enumType = Helper.GetAssembly(this.AssemblyName).GetType(this.EnumName);
 
@@ -80,23 +76,11 @@ private IEnumerable<DataEditor> GetEditorDataItems()
 
                 if (enabled)
                 {
-                    editorDataItems.Add(new DataEditor( { Key = key, Label = label });
+                    editorDataItems.Add(new EditorDataItem() { Key = key, Label = label });
                 }
             }
 
             return editorDataItems;
         }
-
-        public DataSourceView GetView(string viewName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public ICollection GetViewNames()
-        {
-            throw new NotImplementedException();
-        }
-
-        public event EventHandler DataSourceChanged;
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
index 085f536..6274aeb 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
@@ -1,4 +1,5 @@
 using ClientDependency.Core.Logging;
+using nuPickers.Shared.Editor;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Composing;
 
@@ -31,11 +32,15 @@ internal static IEnumerable<string> GetKeys(string value)
         /// <param name="value">the saved value as a string</param>
         /// <param name="editorDataItems"></param>
         /// <returns>bool flag to indicate whether the items could be created from the savedValue supplied</returns>
-        internal static bool TryGetDataEditorItems(string value, out IEnumerable<IDataEditor> editorDataItems)
+        internal static bool TryGetDataEditorItems(string value, out IEnumerable<EditorDataItem> editorDataItems)
         {
             editorDataItems = SaveFormat.GetKeyValuePairs(value)
                                         .Where(x => x.Value != null)
-                                        .Select(x => new DataEditor(Current.Logger,new EditorType()));
+                                        .Select(x => new EditorDataItem()
+                                        {
+                                            Key=x.Key,
+                                            Label = x.Value
+                                        });
 
             return editorDataItems.Count() > 0;
         }
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
index e746d0d..f662c93 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
@@ -9,7 +9,6 @@ namespace nuPickers.Shared.XmlDataSource
     using System.Linq;
     using System.Xml;
     using System.Xml.XPath;
-    using umbraco;
     using Umbraco.Core;
 
     public class XmlDataSource : IDataSource
@@ -59,6 +58,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
 
             switch (this.XmlData)
             {
+                /*
                 case "content":
                     xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Document);
                     break;
@@ -70,7 +70,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                 case "members":
                     xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Member);
                     break;
-
+*/
                 case "url":
                     xmlDocument = new XmlDocument();
 
diff --git a/source/nuPickers/nuPickerComposer.cs b/source/nuPickers/nuPickerComposer.cs
index 982df47..9999522 100644
--- a/source/nuPickers/nuPickerComposer.cs
+++ b/source/nuPickers/nuPickerComposer.cs
@@ -1,4 +1,6 @@
 using nuPickers.Components;
+using nuPickers.Shared.DataSource;
+using nuPickers.Shared.EnumDataSource;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 
@@ -15,6 +17,8 @@ public void Compose(Composition composition)
             composition.Register<EmbeddedResourceCompontent>(Lifetime.Singleton);
 
             composition.Register<RelationMappingComponent>(Lifetime.Singleton);
+            composition.Register(typeof(DataSourceApiController), Lifetime.Request);
+            composition.Register(typeof(EnumDataSourceApiController), Lifetime.Request);
 
         }
     }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 7f75bf0..7ad4d61 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -327,7 +327,8 @@
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
@@ -336,11 +337,29 @@
     <Compile Include="PickerPropertyValueConverter.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
+    <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
+    <Compile Include="Shared\DataSource\DataSource.cs" />
+    <Compile Include="Shared\DataSource\DataSourceApiController.cs" />
+    <Compile Include="Shared\DataSource\DataSourceApiResponse.cs" />
+    <Compile Include="Shared\DataSource\IDataSource.cs" />
+    <Compile Include="Shared\DotNetDataSource\DotNetDataSource.cs" />
+    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceApiController.cs" />
+    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceAttribute.cs" />
+    <Compile Include="Shared\DotNetDataSource\DotNetDataSourceProperty.cs" />
+    <Compile Include="Shared\DotNetDataSource\IDotNetDataSource.cs" />
+    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourceKeyed.cs" />
+    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourcePaged.cs" />
+    <Compile Include="Shared\DotNetDataSource\IDotNetDataSourceTypeahead.cs" />
     <Compile Include="Shared\Editor\Editor.cs" />
     <Compile Include="Shared\Editor\EditorDataItem.cs" />
     <Compile Include="Shared\EnumDataSource\EnumExtensions.cs" />
+    <Compile Include="Shared\JsonDataSource\JsonDataSource.cs" />
+    <Compile Include="Shared\LuceneDataSource\LuceneDataSource.cs" />
     <Compile Include="Shared\LuceneDataSource\LuceneDataSourceApiController.cs" />
     <Compile Include="Shared\Paging\PageMarker.cs" />
+    <Compile Include="Shared\RelationDataSource\RelationDataSource.cs" />
+    <Compile Include="Shared\RelationDataSource\RelationDataSourceApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMapping.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingComment.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormatPropertyValueEditor.cs" />
@@ -351,6 +370,8 @@
     <Compile Include="Shared\SaveFormat\SaveFormat.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSource.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSourceApiController.cs" />
+    <Compile Include="Shared\TypeaheadListPicker\TypeaheadListPicker.cs" />
+    <Compile Include="Shared\XmlDataSource\XmlDataSource.cs" />
     <Compile Include="Validators\RegexValidator.cs" />
     <Compile Include="Validators\RequiredValidator.cs" />
   </ItemGroup>
@@ -454,7 +475,20 @@
     <EmbeddedResource Include="Shared\PagedListPicker\PagedListPickerEditor.css" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Shared\CustomLabel\CustomLabelConfig.html" />
+    <Content Include="Shared\CustomLabel\CustomLabelConfigController.js" />
+    <Content Include="Shared\DataSource\DataSourceResource.js" />
+    <Content Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
+    <Content Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
     <Content Include="Shared\Editor\EditorResource.js" />
+    <Content Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
+    <Content Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
+    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
+    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
+    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
+    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
+    <Content Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
+    <Content Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

From 0c7022f5523f47f0c610d9efdc782e959a004565 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 00:43:20 +0100
Subject: [PATCH 05/43] First changes for EnumCheckboxPicker

---
 .../EnumCheckBoxPickerConfiguration.cs        |  25 +++
 .../EnumCheckBoxPickerConfigurationEditor.cs  | 169 ++++++++++++++++++
 .../EnumCheckBoxPickerPreValueEditor.cs       |  23 ---
 .../EnumCheckBoxPickerPropertyEditor.cs       |  13 +-
 .../EnumDropDownPickerConfigurationEditor.cs  |   4 -
 source/nuPickers/nuPickers.csproj             |   3 +
 6 files changed, 205 insertions(+), 32 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..bcbb5fe
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -0,0 +1,25 @@
+namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public string CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..83de2ca
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,169 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
+{
+    internal class EnumCheckBoxPickerConfigurationEditor : ConfigurationEditor<EnumCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, EnumCheckBoxPickerConfiguration configuration)
+        {
+            var output = new EnumCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                var convertString = checkBoxPickerObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CheckBoxPicker = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 4d70f29..0000000
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumCheckBoxPickerPreValueEditor : ConfigurationEditor
-    {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
index 9869b1f..cf9b7f4 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -23,11 +25,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class EnumCheckBoxPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumCheckBoxPickerConfigurationEditor();
+
+        public EnumCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new EnumCheckBoxPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
index 2b8ff05..54c7d26 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
@@ -12,10 +12,6 @@ namespace nuPickers.PropertyEditors.EnumDropDownPicker
 
     internal class EnumDropDownPickerConfigurationEditor : ConfigurationEditor<EnumDropDownPickerConfiguration>
     {
-        public EnumDropDownPickerConfigurationEditor()
-        {
-
-        }
         public override Dictionary<string, object> ToConfigurationEditor(EnumDropDownPickerConfiguration configuration)
         {
             var configuredItems = configuration?.Items; // ordered
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 7ad4d61..c36cbbb 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -327,6 +327,9 @@
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />

From bc0407360bde6e23f0236cb5b7ec73a8296d2840 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 10:25:56 +0100
Subject: [PATCH 06/43] Enum Labels Editor

---
 .../EmbeddedResource/EmbeddedResource.cs      |   2 +-
 .../EnumLabels/EnumLabelsConfiguration.cs     |  25 +++
 .../EnumLabelsConfigurationEditor.cs          | 142 ++++++++++++++++++
 .../EnumLabels/EnumLabelsPreValueEditor.cs    |  23 ---
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |  11 +-
 .../PropertyEditors/PickerPropertyEditor.cs   |  17 ++-
 source/nuPickers/nuPickers.csproj             |   7 +
 7 files changed, 194 insertions(+), 33 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs

diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index fa8d3ff..6ddb2c1 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -15,6 +15,6 @@ internal static class EmbeddedResource
         /// <summary>
         /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = "";
+        internal const string FILE_EXTENSION = ".nu";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
new file mode 100644
index 0000000..0be960e
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -0,0 +1,25 @@
+namespace nuPickers.PropertyEditors.EnumLabels
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class EnumLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..5803311
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumDropDownPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.EnumLabels
+{
+    internal class EnumLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumLabelsConfiguration configuration)
+        {
+            var output = new EnumLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs
deleted file mode 100644
index 1f13501..0000000
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
index c5803e5..6a99ea8 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.EnumLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.EnumLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -24,9 +26,10 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class EnumLabelsPropertyEditor : BasePropertyEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
+
+        public EnumLabelsPropertyEditor(ILogger logger) : base(logger)
         {
-            return new EnumLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
index 14f0dd8..be12f63 100644
--- a/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
@@ -1,4 +1,8 @@
 // left this file here for reference - would be handy if PropertyEditorAsset attributes worked with inheritance, as all pickers share these resources:
+
+using nuPickers.EmbeddedResource;
+using Umbraco.Core.Logging;
+
 namespace nuComponents.DataTypes.PropertyEditors
 {
     using ClientDependency.Core;
@@ -6,14 +10,17 @@ namespace nuComponents.DataTypes.PropertyEditors
     using Umbraco.Web.PropertyEditors;
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "Editor/EditorResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "DataSource/DataSourceResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "RelationMapping/RelationMappingResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "SaveFormat/SaveFormatResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js")]
 
     // CONFIG
     [PropertyEditorAsset(ClientDependencyType.Javascript, "App_Plugins/nuComponents/DataTypes/Shared/RelationTypeMapping/RelationMappingConfigController.js")]
-    public abstract class PickerPropertyEditor : BasePropertyEditor
+    public abstract class PickerPropertyEditor : DataEditor
     {
+        protected PickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
     }
 }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index c36cbbb..8287eea 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -333,6 +333,9 @@
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfiguration.cs" />
+    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
@@ -478,6 +481,10 @@
     <EmbeddedResource Include="Shared\PagedListPicker\PagedListPickerEditor.css" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
+    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
+    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
+    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
     <Content Include="Shared\CustomLabel\CustomLabelConfig.html" />
     <Content Include="Shared\CustomLabel\CustomLabelConfigController.js" />
     <Content Include="Shared\DataSource\DataSourceResource.js" />

From 9e476847e09bc3bbe0eee2c30963468b5d62d524 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 10:38:01 +0100
Subject: [PATCH 07/43] Enum Lables Editor, Enum PrefetchList Picker

---
 .../EnumCheckBoxPickerPropertyEditor.cs       |  46 +++--
 .../EnumDropDownPickerPropertyEditor.cs       |   4 +-
 .../EnumLabels/EnumLabelsConfiguration.cs     |  13 +-
 .../EnumLabelsConfigurationEditor.cs          |  16 +-
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |  39 +++--
 .../EnumPrefetchListPickerConfiguration.cs    |  31 ++++
 ...umPrefetchListPickerConfigurationEditor.cs | 163 ++++++++++++++++++
 .../EnumPrefetchListPickerPreValueEditor.cs   |  23 ---
 .../EnumPrefetchListPropertyEditor.cs         |  49 ++++--
 source/nuPickers/nuPickers.csproj             |   3 +
 10 files changed, 312 insertions(+), 75 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
index cf9b7f4..361997f 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
@@ -1,33 +1,47 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
+namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
     using nuPickers.PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
+    using Umbraco.Core.Logging;
 
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
+        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" +
+        EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class EnumCheckBoxPickerPropertyEditor : DataEditor
     {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumCheckBoxPickerConfigurationEditor();
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumCheckBoxPickerConfigurationEditor();
 
         public EnumCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
         {
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
index 3ebe095..6a7dae8 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
+
 
 namespace nuPickers.PropertyEditors.EnumDropDownPicker
 {
@@ -8,6 +7,7 @@ namespace nuPickers.PropertyEditors.EnumDropDownPicker
     using nuPickers.PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
+    using Umbraco.Core.Logging;
 
     // EDITOR UI
     [DataEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
index 0be960e..78772fc 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -5,20 +5,25 @@
 
     internal class EnumLabelsConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+            true)]
         public string Labels { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
+
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
     }
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
index 5803311..c0dc453 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
@@ -31,13 +31,15 @@ public override Dictionary<string, object> ToConfigurationEditor(EnumLabelsConfi
             var dataSource = configuration?.DataSource;
             var labels = configuration?.Labels;
             var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
 
             return new Dictionary<string, object>
             {
                 { "items", editorItems },
                 { "useLabel", useLabel },
                 { "dataSource", dataSource },
-                { "labels", labels }
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
 
             };
         }
@@ -109,6 +111,18 @@ public override EnumLabelsConfiguration FromConfigurationEditor(IDictionary<stri
                 if (convertString.Success)
                     output.Labels = convertString.Result;
             }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
             // auto-assigning our ids, get next id from existing values
             var nextId = 1;
             if (configuration?.Items != null && configuration.Items.Count > 0)
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
index 6a99ea8..9300595 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
@@ -1,7 +1,6 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.EnumLabels
+namespace nuPickers.PropertyEditors.EnumLabels
 {
+    using Umbraco.Core.Logging;
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
     using nuPickers.PropertyEditors;
@@ -9,21 +8,33 @@ namespace nuPickers.PropertyEditors.EnumLabels
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
+        EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class EnumLabelsPropertyEditor : BasePropertyEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..badb32b
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -0,0 +1,31 @@
+namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public string PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public string ListPicker { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..d972216
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,163 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
+{
+    internal class EnumPrefetchListPickerConfigurationEditor : ConfigurationEditor<EnumPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumPrefetchListPickerConfiguration configuration)
+        {
+            var output = new EnumPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index 58fffc3..0000000
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
index 9c20ea3..06cf9ff 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -1,5 +1,6 @@
 namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
 {
+    using Umbraco.Core.Logging;
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
     using nuPickers.PropertyEditors;
@@ -7,28 +8,46 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
+        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" +
+        EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class EnumPrefetchListPropertyEditor : BasePropertyEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumPrefetchListPickerConfigurationEditor();
+
+
+        public EnumPrefetchListPropertyEditor(ILogger logger) : base(logger)
         {
-            return new EnumPrefetchListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 8287eea..4132c8b 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -336,6 +336,9 @@
     <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>

From dcb48f4061b0a46ac5c620160d09834449aaef4d Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 11:59:30 +0100
Subject: [PATCH 08/43] MIgrate DonetPagedListPicker, move unit testing to
 Nunit

---
 .../EmbeddedResourceHelperTests.cs            |  16 +-
 .../EmbeddedResource/EmbeddedResource.cs      |   2 +-
 source/nuPickers/NuHandler.cs                 |   2 +
 .../DotNetPagedListPickerConfiguration.cs     |  28 +++
 ...otNetPagedListPickerConfigurationEditor.cs | 171 ++++++++++++++++++
 .../DotNetPagedListPickerPreValueEditor.cs    |  26 ---
 .../DotNetPagedListPickerPropertyEditor.cs    |  15 +-
 .../EnumCheckBoxPickerConfiguration.cs        |   2 +-
 .../EnumCheckBoxPickerConfigurationEditor.cs  |   2 +-
 .../EnumPrefetchListPickerConfiguration.cs    |   4 +-
 ...umPrefetchListPickerConfigurationEditor.cs |   4 +-
 .../EnumPrefetchListPropertyEditor.cs         |   2 +-
 .../Shared/CustomLabel/CustomLabel.cs         |  85 ++++-----
 source/nuPickers/nuPickers.csproj             |   3 +
 14 files changed, 268 insertions(+), 94 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs

diff --git a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
index 9896dfb..d6a20d9 100644
--- a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
+++ b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
@@ -1,9 +1,7 @@
 namespace nuPickers.Tests.EmbeddedResource
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using NUnit.Framework;
     using nuPickers.EmbeddedResource;
-
-    [TestClass]
     public class HelperEmbeddedResourceHelperTests
     {
         // reference to known embedded resources (picked first folder in shared)
@@ -11,7 +9,7 @@ public class HelperEmbeddedResourceHelperTests
         private const string CSS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.css";
         private const string JS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditorController.js";
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatDoNotExist()
         {
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(null));
@@ -21,7 +19,7 @@ public void ResourceNamesThatDoNotExist()
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatExist()
         {
             Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
@@ -29,7 +27,7 @@ public void ResourceNamesThatExist()
             Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatDoNotExist()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResource(null));
@@ -39,7 +37,7 @@ public void GetResourcesThatDoNotExist()
             Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatExist()
         {
             Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
@@ -47,7 +45,7 @@ public void GetResourcesThatExist()
             Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromValidPath()
         {
             Assert.AreEqual(
@@ -63,7 +61,7 @@ public void GetResourceNameFromValidPath()
                     EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromInvalidPath()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath(null));
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index 6ddb2c1..fa8d3ff 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -15,6 +15,6 @@ internal static class EmbeddedResource
         /// <summary>
         /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = ".nu";
+        internal const string FILE_EXTENSION = "";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/NuHandler.cs b/source/nuPickers/NuHandler.cs
index 23942d5..3ea5fa1 100644
--- a/source/nuPickers/NuHandler.cs
+++ b/source/nuPickers/NuHandler.cs
@@ -1,4 +1,6 @@
 
+using nuPickers.EmbeddedResource;
+
 namespace nuPickers
 {
     using System;
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
new file mode 100644
index 0000000..d802bcf
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
@@ -0,0 +1,28 @@
+namespace nuPickers.PropertyEditors.DotNetPagedListPicker
+{
+    using Umbraco.Core.PropertyEditors;
+    using nuPickers.EmbeddedResource;
+
+    internal class DotNetPagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..8d1a1ce
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,171 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumPrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.DotNetPagedListPicker
+{
+    internal class DotNetPagedListPickerConfigurationEditor : ConfigurationEditor<DotNetPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetPagedListPickerConfiguration configuration)
+        {
+            var output = new DotNetPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs
deleted file mode 100644
index 70c614c..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
-
-    internal class DotNetPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
index 21edc1e..ce6278c 100644
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
@@ -4,10 +4,12 @@
     using nuPickers.EmbeddedResource;
     using nuPickers.PropertyEditors;
     using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
+    using Umbraco.Web.PropertyEditors; 
+    using Umbraco.Core.Logging;
+
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,11 +28,14 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPagedListPickerPropertyEditor : BasePropertyEditor
+    public class DotNetPagedListPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPagedListPickerConfigurationEditor();
+
+
+        public DotNetPagedListPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new DotNetPagedListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
index bcbb5fe..a7c6f50 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -14,7 +14,7 @@ internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
         public string CustomLabel { get; set; }
 
         [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
+        public object CheckBoxPicker { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
index 83de2ca..484a3b0 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -126,7 +126,7 @@ public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
             {
-                var convertString = checkBoxPickerObj.TryConvertTo<string>();
+                var convertString = checkBoxPickerObj.TryConvertTo<object>();
                 if (convertString.Success)
                     output.CheckBoxPicker = convertString.Result;
             }
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
index badb32b..ac971fb 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -18,11 +18,11 @@ internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
             EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
+        public object PrefetchListPicker { get; set; }
 
         [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
-        public string ListPicker { get; set; }
+        public object ListPicker { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
index d972216..098d9bc 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
@@ -119,13 +119,13 @@ public override EnumPrefetchListPickerConfiguration FromConfigurationEditor(IDic
             }
             if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
             {
-                var convertString = prefetchListPickerObj.TryConvertTo<string>();
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
                 if (convertString.Success)
                     output.PrefetchListPicker = convertString.Result;
             }
             if (editorValues.TryGetValue("listPicker", out var listPickerObj))
             {
-                var convertString = listPickerObj.TryConvertTo<string>();
+                var convertString = listPickerObj.TryConvertTo<object>();
                 if (convertString.Success)
                     output.ListPicker = convertString.Result;
             }
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
index 06cf9ff..49e4c67 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -9,7 +9,7 @@
 
     // EDITOR UI
     [DataEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
-        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT" )]
     [PropertyEditorAsset(ClientDependencyType.Css,
         EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 2a2aa39..21e5249 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -1,18 +1,13 @@
-
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Composing;
-
-namespace nuPickers.Shared.CustomLabel
+namespace nuPickers.Shared.CustomLabel
 {
-    using nuPickers.Shared.Editor;
+    using Editor;
     using System.Collections.Generic;
     using System.ComponentModel;
-    using System.IO;
     using System.Linq;
-    using System.Text;
     using System.Web;
-    using System.Web.UI;
+    using Umbraco.Core.Models;
+    using Umbraco.Core.Models.PublishedContent;
+    using Umbraco.Web.Composing;
 
     internal class CustomLabel
     {
@@ -50,15 +45,16 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
             }
             else
             {
-                 // fallback nd find first published page to use as host
-                 IPublishedContent contextNode = Current.UmbracoContext.ContentCache.GetSingleByXPath(string.Concat("descendant::*[@parentID = ", Current.Services.ContentService.GetRootContent().FirstOrDefault(), "]"));
-                 if (contextNode != null)
-                 {
-                     HttpContext.Current.Items["pageID"] = contextNode.Id;
-                     this.HasMacroContext = true;
-                 }
+                // fallback nd find first published page to use as host
+                IPublishedContent contextNode = Current.UmbracoContext.ContentCache.GetSingleByXPath(
+                    string.Concat("descendant::*[@parentID = ",
+                        Current.Services.ContentService.GetRootContent().FirstOrDefault(), "]"));
+                if (contextNode != null)
+                {
+                    HttpContext.Current.Items["pageID"] = contextNode.Id;
+                    this.HasMacroContext = true;
+                }
             }
-
         }
 
         /// <summary>
@@ -69,17 +65,19 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
         /// <returns></returns>
         internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDataItem> editorDataItems)
         {
-            string keys = string.Join(", ", editorDataItems.Select(x => x.Key)); // csv of all keys
+            var dataItems = editorDataItems.ToList();
+            string keys = string.Join(", ", dataItems.Select(x => x.Key)); // csv of all keys
             int counter = 0;
-            int total = editorDataItems.Count();
+            int total = dataItems.Count();
 
-            foreach (EditorDataItem editorDataItem in editorDataItems)
+            foreach (EditorDataItem editorDataItem in dataItems)
             {
                 counter++;
-                editorDataItem.Label = this.ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
+                editorDataItem.Label =
+                    this.ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
             }
 
-            return editorDataItems.Where(x => !string.IsNullOrWhiteSpace(x.Label)); // remove any options without a label
+            return dataItems.Where(x => !string.IsNullOrWhiteSpace(x.Label)); // remove any options without a label
         }
 
         /// <summary>
@@ -95,19 +93,20 @@ private string ProcessMacro(string key, string label, string keys, int counter,
         {
             if (!string.IsNullOrWhiteSpace(this.MacroAlias) && this.HasMacroContext)
             {
-                Macro macro = new Macro() { Alias = this.MacroAlias };
-/*
-                macro.Properties.Add(new MacroProperty("contextId".ToLower(), this.ContextId.ToString()));
-                macro.Properties.Add(new MacroProperty("propertyAlias".ToLower(), this.PropertyAlias));
-
-                macro.Properties.Add("key", key);
-                macro.Properties.Add("label", label);
-
-                macro.Properties.Add("keys", keys);
-                macro.Properties.Add("counter", counter);
-                macro.Properties.Add("total", total);
-*/
-                label = this.RenderToString(macro);
+                Macro macro = new Macro() {Alias = this.MacroAlias};
+                Dictionary<string, object> properties = new Dictionary<string, object>();
+
+                properties.Add("contextId".ToLower(), this.ContextId.ToString());
+                properties.Add("propertyAlias".ToLower(), this.PropertyAlias);
+
+                properties.Add("key", key);
+                properties.Add("label", label);
+
+                properties.Add("keys", keys);
+                properties.Add("counter", counter);
+                properties.Add("total", total);
+
+                label = this.RenderToString(macro, properties);
             }
 
             return label;
@@ -117,16 +116,10 @@ private string ProcessMacro(string key, string label, string keys, int counter,
         /// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functionality elsewhere)
         /// </summary>
         /// <param name="macro"></param>
-        private string RenderToString(Macro macro)
+        /// <param name="properties"></param>
+        private string RenderToString(Macro macro, Dictionary<string, object> properties)
         {
-            StringBuilder stringBuilder = new StringBuilder();
-            using (StringWriter stringWriter = new StringWriter(stringBuilder))
-            using (HtmlTextWriter htmlTextWriter = new HtmlTextWriter(stringWriter))
-            {
-             //   macro.RenderControl(htmlTextWriter);
-            }
-
-            return stringBuilder.ToString();
+            return Current.UmbracoHelper.RenderMacro(macro.Alias, properties).ToHtmlString();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 4132c8b..482ae1e 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -327,6 +327,9 @@
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />

From 35dc368f3931c58d6e5515dc2e2a69750fb1316e Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 13:38:59 +0100
Subject: [PATCH 09/43] JsonLabels and Jsondropdown

---
 .../EnumDropDownPickerConfiguration.cs        |   1 +
 .../JsonDropDownPickerConfiguration.cs        |  23 +++
 .../JsonDropDownPickerConfigurationEditor.cs  | 147 +++++++++++++++++
 .../JsonDropDownPickerPreValueEditor.cs       |  17 --
 .../JsonDropDownPickerPropertyEditor.cs       |  13 +-
 .../JsonLabels/JsonLabelsConfiguration.cs     |  29 ++++
 .../JsonLabelsConfigurationEditor.cs          | 156 ++++++++++++++++++
 .../JsonLabels/JsonLabelsPreValueEditor.cs    |  23 ---
 .../JsonLabels/JsonLabelsPropertyEditor.cs    |  13 +-
 .../CustomLabel/CustomLabelApiController.cs   |   2 +-
 source/nuPickers/nuPickers.csproj             |   6 +
 11 files changed, 379 insertions(+), 51 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
index b2dab3a..821712c 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
+++ b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
@@ -11,6 +11,7 @@ public class EnumDropDownPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
+
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
     }
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..f14d662
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
@@ -0,0 +1,23 @@
+namespace nuPickers.PropertyEditors.JsonDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..cb0ccd5
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,147 @@
+namespace nuPickers.PropertyEditors.JsonDropDownPicker
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+    using Umbraco.Core;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonDropDownPickerConfigurationEditor : ConfigurationEditor<JsonDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override JsonDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            JsonDropDownPickerConfiguration configuration)
+        {
+            var output = new JsonDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs
deleted file mode 100644
index ec99def..0000000
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
index 41f10a7..2374fad 100644
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.JsonDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,11 +23,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonDropDownPickerPropertyEditor : BasePropertyEditor
+    public class JsonDropDownPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonDropDownPickerConfigurationEditor();
+
+        public JsonDropDownPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new JsonDropDownPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs
new file mode 100644
index 0000000..f99d088
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs
@@ -0,0 +1,29 @@
+namespace nuPickers.PropertyEditors.JsonLabels
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
+            HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public object Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..2f4e857
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.JsonLabels
+{
+    internal class JsonLabelsConfigurationEditor : ConfigurationEditor<JsonLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonLabelsConfiguration configuration)
+        {
+            var output = new JsonLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs
deleted file mode 100644
index 353e3e9..0000000
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
index 1d6dd91..276bf0f 100644
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.JsonLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.JsonLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,11 +24,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonLabelsPropertyEditor : BasePropertyEditor
+    public class JsonLabelsPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonLabelsConfigurationEditor();
+
+        public JsonLabelsPropertyEditor(ILogger logger) : base(logger)
         {
-            return new JsonLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
index 7f318bc..5dd9768 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
@@ -14,7 +14,7 @@ public class CustomLabelApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetMacros()
         {
-            //using legacy api as no method on Umbraco.Core.Services.MacroSerivce to get all macros
+
             return Current.Services.MacroService.GetAll()
                         .Select(x => new
                         {
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 482ae1e..43fa3db 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -342,6 +342,12 @@
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfiguration.cs" />
+    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>

From 36c23210e44359fb321e43cd78dbdff3e516d518 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 15:58:56 +0100
Subject: [PATCH 10/43] Lucene Picker

---
 .../LuceneDropDownPickerConfiguration.cs      |  19 +++
 ...LuceneDropDownPickerConfigurationEditor.cs | 148 ++++++++++++++++++
 .../LuceneDropDownPickerPreValueEditor.cs     |  17 --
 .../LuceneDropDownPickerPropertyEditor.cs     |  13 +-
 .../LuceneDataSource/LuceneDataSource.cs      |   5 +-
 .../LuceneDataSourceApiController.cs          |   2 +-
 source/nuPickers/nuPickers.csproj             |   3 +
 7 files changed, 182 insertions(+), 25 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..a0e4e45
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
@@ -0,0 +1,19 @@
+namespace nuPickers.PropertyEditors.LuceneDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LuceneDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..bb75bd7
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.JsonDropDownPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.LuceneDropDownPicker
+{
+    internal class LuceneDropDownPickerConfigurationEditor : ConfigurationEditor<LuceneDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            LuceneDropDownPickerConfiguration configuration)
+        {
+            var output = new LuceneDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 32845ee..0000000
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
index fbcb568..873ef7b 100644
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.LuceneDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,11 +23,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneDropDownPickerPropertyEditor : BasePropertyEditor
+    public class LuceneDropDownPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneDropDownPickerConfigurationEditor();
+
+        public LuceneDropDownPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new LuceneDropDownPickerPreValueEditor();
         }
     }
 
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
index e6e3219..e74c4e9 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
@@ -1,4 +1,5 @@
 using Examine.Search;
+using Umbraco.Web.Composing;
 using Umbraco.Examine;
 
 namespace nuPickers.Shared.LuceneDataSource
@@ -54,8 +55,8 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
         private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
-
-            ISearcher searchProvider = _examineManager.TryGetIndex(ExamineSearcher, out var externalIndex) ? externalIndex.GetSearcher() : null;
+            var examineManager =  ExamineManager.Instance;
+            var getSearcher = examineManager.TryGetSearcher(ExamineSearcher, out var searchProvider);
 
             if (searchProvider != null)
             {
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
index 0de111a..9f7788a 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
@@ -12,7 +12,7 @@ public class LuceneDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetExamineSearchers()
         {
-            return Examine.ExamineManager.Instance.RegisteredSearchers.OfType<UmbracoExamineIndex>().Select(x => x.Name);
+            return Examine.ExamineManager.Instance.RegisteredSearchers.Select(x => x.Name);
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 43fa3db..19cac66 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -348,6 +348,9 @@
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>

From 30318a67c700e095094cebbf4e6229fcab4cede8 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 17:02:52 +0100
Subject: [PATCH 11/43] LuceneLabels

---
 .../LuceneLabels/LuceneLabelsConfiguration.cs |  25 +++
 .../LuceneLabelsConfigurationEditor.cs        | 152 ++++++++++++++++++
 .../LuceneLabelsPreValueEditor.cs             |  23 ---
 .../LuceneLabelsPropertyEditor.cs             |  13 +-
 source/nuPickers/nuPickers.csproj             |  25 +++
 5 files changed, 210 insertions(+), 28 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs
new file mode 100644
index 0000000..6c5fd8a
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs
@@ -0,0 +1,25 @@
+namespace nuPickers.PropertyEditors.LuceneLabels
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LuceneLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..19af5c9
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.LuceneLabels
+{
+    internal class LuceneLabelsConfigurationEditor : ConfigurationEditor<LuceneLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var customLabel = configuration?.CustomLabel;
+
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection},
+                {"customLabel",customLabel}
+
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            LuceneLabelsConfiguration configuration)
+        {
+            var output = new LuceneLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+
+                    output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customLabelObj))
+            {
+
+                    output.CustomLabel = customLabelObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs
deleted file mode 100644
index cc21763..0000000
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
index 796fb3e..7643e0c 100644
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.LuceneLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.LuceneLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,11 +24,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneLabelsPropertyEditor : BasePropertyEditor
+    public class LuceneLabelsPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneLabelsConfigurationEditor();
+
+        public LuceneLabelsPropertyEditor(ILogger logger) : base(logger)
         {
-            return new LuceneLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 19cac66..93bf95b 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -342,15 +342,40 @@
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
+    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>

From 2ba874cc15d500907c18aa94f8afebb77d1573ea Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sun, 11 Aug 2019 20:39:24 +0100
Subject: [PATCH 12/43] enum,json, lucene pickers

---
 .../EnumCheckBoxPickerConfigurationEditor.cs  |  12 +-
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |   2 +-
 .../EnumPrefetchListPropertyEditor.cs         |   2 +-
 .../EnumRadioButtonPickerConfiguration.cs     |  22 +++
 ...numRadioButtonPickerConfigurationEditor.cs | 150 +++++++++++++++
 .../EnumRadioButtonPickerPreValueEditor.cs    |  20 --
 .../EnumRadioButtonPickerPropertyEditor.cs    |  15 +-
 .../JsonCheckBoxPickerConfiguration.cs        |  28 +++
 .../JsonCheckBoxPickerConfigurationEditor.cs  | 172 ++++++++++++++++++
 .../JsonCheckBoxPickerPreValueEditor.cs       |  26 ---
 .../JsonCheckBoxPickerPropertyEditor.cs       |  13 +-
 .../JsonPagedListPickerConfiguration.cs       |  35 ++++
 .../JsonPagedListPickerConfigurationEditor.cs | 171 +++++++++++++++++
 .../JsonPagedListPickerPreValueEditor.cs      |  26 ---
 .../JsonPagedListPickerPropertyEditor.cs      |  13 +-
 .../JsonPrefetchListPickerPreValueEditor.cs   |  14 +-
 .../JsonPrefetchListPickerPropertyEditor.cs   |   4 +-
 .../JsonRadioButtonPickerPreValueEditor.cs    |  12 +-
 .../JsonRadioButtonPickerPropertyEditor.cs    |   4 +-
 .../JsonTypeaheadListPickerPreValueEditor.cs  |  14 +-
 .../JsonTypeaheadPickerPropertyEditor.cs      |   4 +-
 .../LuceneCheckBoxPickerPreValueEditor.cs     |  14 +-
 .../LuceneCheckBoxPickerPropertyEditor.cs     |   4 +-
 .../LucenePagedListPickerPreValueEditor.cs    |  14 +-
 .../LucenePagedListPickerPropertyEditor.cs    |   4 +-
 .../LucenePrefetchListPickerPreValueEditor.cs |  14 +-
 .../LucenePrefetchListPickerPropertyEditor.cs |   4 +-
 .../LuceneRadioButtonPickerPreValueEditor.cs  |  12 +-
 .../LuceneRadioButtonPickerPropertyEditor.cs  |   4 +-
 ...LuceneTypeaheadListPickerPreValueEditor.cs |  14 +-
 .../LuceneTypeaheadPickerPropertyEditor.cs    |   4 +-
 source/nuPickers/nuPickers.csproj             |   9 +-
 32 files changed, 685 insertions(+), 171 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
index 484a3b0..026aad0 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -105,16 +105,12 @@ public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
             {
-                var convertString = dataSourceObj.TryConvertTo<object>();
-                if (convertString.Success)
-                    output.DataSource = convertString.Result;
+                output.DataSource = dataSourceObj;
             }
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
-                if (convertString.Success)
-                    output.SaveFormat = convertString.Result;
+                output.SaveFormat = saveFormatObj;
             }
 
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
@@ -126,9 +122,7 @@ public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
             {
-                var convertString = checkBoxPickerObj.TryConvertTo<object>();
-                if (convertString.Success)
-                    output.CheckBoxPicker = convertString.Result;
+                output.CheckBoxPicker = checkBoxPickerObj;
             }
 
             if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
index 9300595..bfe56cf 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
@@ -35,7 +35,7 @@
         EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
         EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumLabelsPropertyEditor : BasePropertyEditor
+    public class EnumLabelsPropertyEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
 
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
index 49e4c67..6b211fe 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -40,7 +40,7 @@
         EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
         EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumPrefetchListPropertyEditor : BasePropertyEditor
+    public class EnumPrefetchListPropertyEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new EnumPrefetchListPickerConfigurationEditor();
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..80b3eca
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
@@ -0,0 +1,22 @@
+namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class EnumRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..04be629
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,150 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumPrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
+{
+    internal class EnumRadioButtonPickerConfigurationEditor : ConfigurationEditor<EnumRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumRadioButtonPickerConfiguration configuration)
+        {
+            var output = new EnumRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 84d3be2..0000000
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
index f015932..ed9617a 100644
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,11 +24,14 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class EnumRadioButtonPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumRadioButtonPickerConfigurationEditor();
+
+
+        public EnumRadioButtonPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new EnumRadioButtonPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..1f75ab1
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
@@ -0,0 +1,28 @@
+namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", " Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..abb8120
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,172 @@
+namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+    using nuPickers.PropertyEditors.JsonDropDownPicker;
+    using Umbraco.Core;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonCheckBoxPickerConfigurationEditor : ConfigurationEditor<JsonCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override JsonCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues,
+            JsonCheckBoxPickerConfiguration configuration)
+        {
+            var output = new JsonCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                    output.SaveFormat = saveFormatObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 34b85a7..0000000
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
index 9d69e05..7085f40 100644
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,11 +26,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class JsonCheckBoxPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonCheckBoxPickerConfigurationEditor();
+
+        public JsonCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new JsonCheckBoxPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
new file mode 100644
index 0000000..e42f080
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
@@ -0,0 +1,35 @@
+namespace nuPickers.PropertyEditors.JsonPagedListPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonPagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Page List Picker",
+            EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..058210c
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,171 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.DotNetPagedListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.JsonPagedListPicker
+{
+    internal class JsonPagedListPickerConfigurationEditor : ConfigurationEditor<JsonPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonPagedListPickerConfiguration configuration)
+        {
+            var output = new JsonPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs
deleted file mode 100644
index 0909759..0000000
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
index 0a9a66d..caf06d2 100644
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.JsonPagedListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPagedListPickerPropertyEditor : BasePropertyEditor
+    public class JsonPagedListPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonPagedListPickerConfigurationEditor();
+
+        public JsonPagedListPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new JsonPagedListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
index 74023ca..afcecaf 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class JsonPrefetchListPickerPreValueEditor : PreValueEditor
+    internal class JsonPrefetchListPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
index 0484f4c..8447d61 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,7 +25,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class JsonPrefetchListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
index 4fa07c8..fe70e92 100644
--- a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
@@ -3,21 +3,21 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class JsonRadioButtonPickerPreValueEditor : PreValueEditor
+    internal class JsonRadioButtonPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
index 3e4c489..06c954d 100644
--- a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,7 +23,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class JsonRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
index 2a157b1..633b1c8 100644
--- a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class JsonTypeaheadListPickerPreValueEditor : PreValueEditor
+    internal class JsonTypeaheadListPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
index 64ae1a7..d363245 100644
--- a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonTypeaheadPickerPropertyEditor : BasePropertyEditor
+    public class JsonTypeaheadPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
index ccb50c0..9991b9d 100644
--- a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LuceneCheckBoxPickerPreValueEditor : PreValueEditor
+    internal class LuceneCheckBoxPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
index bb79e03..579202d 100644
--- a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,7 +24,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class LuceneCheckBoxPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
index a0cb1bf..592642f 100644
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LucenePagedListPickerPreValueEditor : PreValueEditor
+    internal class LucenePagedListPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "Page List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public string PagedListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
index 29b7b69..947b54d 100644
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePagedListPickerPropertyEditor : BasePropertyEditor
+    public class LucenePagedListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
index b480b25..aaacedd 100644
--- a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LucenePrefetchListPickerPreValueEditor : PreValueEditor
+    internal class LucenePrefetchListPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
index cd35baa..cf619f7 100644
--- a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,7 +25,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class LucenePrefetchListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
index dde0771..8871634 100644
--- a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
@@ -3,21 +3,21 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LuceneRadioButtonPickerPreValueEditor : PreValueEditor
+    internal class LuceneRadioButtonPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
index 27c1a8b..5d0b3f5 100644
--- a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,7 +23,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class LuceneRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
index 2e70dc9..98d40a1 100644
--- a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LuceneTypeaheadListPickerPreValueEditor : PreValueEditor
+    internal class LuceneTypeaheadListPickerPreValueEditor : ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
index b1735a7..5621d73 100644
--- a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneTypeaheadPickerPropertyEditor : BasePropertyEditor
+    public class LuceneTypeaheadPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 93bf95b..0d3798e 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -342,17 +342,20 @@
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPreValueEditor.cs" />
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />

From 5e7aff67019126ba79c9ec294eebecd83828eb70 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 08:54:36 +0100
Subject: [PATCH 13/43] bum minimal umbraco version to 8.1.1.

---
 build/nuPickers.proj                          |   4 +-
 .../JsonPrefetchListPickerConfiguration.cs    |  35 ++++
 ...onPrefetchListPickerConfigurationEditor.cs | 163 +++++++++++++++++
 .../JsonPrefetchListPickerPreValueEditor.cs   |  26 ---
 .../JsonPrefetchListPickerPropertyEditor.cs   |  11 +-
 .../LucenePagedListPickerConfiguration.cs     |  35 ++++
 ...ucenePagedListPickerConfigurationEditor.cs | 171 ++++++++++++++++++
 .../LucenePagedListPickerPreValueEditor.cs    |  26 ---
 .../LucenePagedListPickerPropertyEditor.cs    |   9 +-
 .../LuceneDataSource/LuceneDataSource.cs      |   7 +-
 source/nuPickers/nuPickers.csproj             |   6 +-
 11 files changed, 429 insertions(+), 64 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs

diff --git a/build/nuPickers.proj b/build/nuPickers.proj
index 2caa835..5ef5444 100644
--- a/build/nuPickers.proj
+++ b/build/nuPickers.proj
@@ -15,8 +15,8 @@
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
     <PackageName>nuPickers</PackageName>
-    <MinUmbracoVersion>7.2.3</MinUmbracoVersion>
-    <Readme>nuPickers is a collection of Umbraco v7 Property Editors</Readme>
+    <MinUmbracoVersion>8.1.1</MinUmbracoVersion>
+    <Readme>nuPickers is a collection of Umbraco v8 Property Editors</Readme>
     <AuthorName>The nuPickers Team</AuthorName>
     <AuthorUrl>https://github.com/uComponents/nuPickers/graphs/contributors</AuthorUrl>
     <PackageLicenseName>MIT license</PackageLicenseName>
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..037e2da
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -0,0 +1,35 @@
+namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "",
+            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..259470f
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,163 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumPrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
+{
+    internal class JsonPrefetchListPickerConfigurationEditor : ConfigurationEditor<JsonPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonPrefetchListPickerConfiguration configuration)
+        {
+            var output = new JsonPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index afcecaf..0000000
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonPrefetchListPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
index 8447d61..451e0c3 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -27,9 +29,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class JsonPrefetchListPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonPrefetchListPickerConfigurationEditor();
+
+
+        public JsonPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new JsonPrefetchListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
new file mode 100644
index 0000000..2480d1e
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -0,0 +1,35 @@
+namespace nuPickers.PropertyEditors.LucenePagedListPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LucenePagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Page List Picker",
+            EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..1800d58
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
@@ -0,0 +1,171 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.JsonPagedListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.LucenePagedListPicker
+{
+    internal class LucenePagedListPickerConfigurationEditor : ConfigurationEditor<LucenePagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LucenePagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LucenePagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LucenePagedListPickerConfiguration configuration)
+        {
+            var output = new LucenePagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
deleted file mode 100644
index 592642f..0000000
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LucenePagedListPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("pagedListPicker", "Page List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
index 947b54d..228e75f 100644
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.LucenePagedListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -28,9 +30,10 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class LucenePagedListPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePagedListPickerConfigurationEditor();
+
+        public LucenePagedListPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new LucenePagedListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
index e74c4e9..623cc5d 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
@@ -56,8 +56,11 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
             var examineManager =  ExamineManager.Instance;
-            var getSearcher = examineManager.TryGetSearcher(ExamineSearcher, out var searchProvider);
-
+            if(!examineManager.TryGetSearcher(ExamineSearcher, out var searchProvider));
+            {
+                examineManager.TryGetIndex(ExamineSearcher.Replace("Searcher", "Index"), out var internalsearch);
+                searchProvider = (ISearcher)internalsearch;
+            }
             if (searchProvider != null)
             {
                 IQuery searchCriteria = searchProvider.CreateQuery();
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 0d3798e..266c295 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -357,7 +357,8 @@
     <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPreValueEditor.cs" />
     <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPropertyEditor.cs" />
@@ -371,7 +372,8 @@
     <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
     <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPreValueEditor.cs" />
     <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPropertyEditor.cs" />

From 728b5f7e4cffd285c7a32b8f00068af9ea22ca25 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 09:55:29 +0100
Subject: [PATCH 14/43] correct building process, working on http handler

---
 build-appveyor.cmd                            |  9 ++--
 source/nuPickers/NuHandler.cs                 |  4 +-
 .../PropertyEditors/BasePropertyEditor.cs     |  3 +-
 .../DotNetPagedListPickerPropertyEditor.cs    |  4 +-
 .../EnumPrefetchListPropertyEditor.cs         |  4 +-
 .../EnumRadioButtonPickerPropertyEditor.cs    | 33 ++++++-------
 .../JsonLabels/JsonLabelsPropertyEditor.cs    |  4 +-
 .../JsonPrefetchListPickerPropertyEditor.cs   |  4 +-
 .../LuceneLabelsPropertyEditor.cs             |  4 +-
 .../Shared/CustomLabel/CustomLabel.cs         | 47 +++++++++----------
 .../CustomLabel/CustomLabelApiController.cs   | 13 ++---
 .../nuPickers/Shared/DataSource/DataSource.cs | 31 +++++-------
 .../DataSource/DataSourceApiController.cs     |  4 +-
 .../Shared/XmlDataSource/XmlDataSource.cs     | 40 ++++++++--------
 source/nuPickers/nuPickers.csproj             | 13 +----
 15 files changed, 95 insertions(+), 122 deletions(-)

diff --git a/build-appveyor.cmd b/build-appveyor.cmd
index 6aec105..d16eefc 100644
--- a/build-appveyor.cmd
+++ b/build-appveyor.cmd
@@ -16,10 +16,11 @@ IF NOT EXIST "%toolsFolder%" (
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
 	nuget install vswhere -Version 2.3.2 -Source nuget.org -OutputDirectory tools
+	FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A"
+  MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
 )
 
-FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
-MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
+
 
 for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
 	if /i "%%i"=="installationPath" set InstallDir=%%j
@@ -30,8 +31,8 @@ SET VSWherePath="%InstallDir%\MSBuild"
 ECHO.
 ECHO Visual Studio is installed in: %InstallDir%
 
-CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
-
+//CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
+CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err
diff --git a/source/nuPickers/NuHandler.cs b/source/nuPickers/NuHandler.cs
index 3ea5fa1..8a16f9c 100644
--- a/source/nuPickers/NuHandler.cs
+++ b/source/nuPickers/NuHandler.cs
@@ -29,8 +29,8 @@ public void ProcessRequest(HttpContext context)
                 var pos = directoryName.LastIndexOf("\\", StringComparison.Ordinal);
                 var folder = directoryName.Substring(pos + 1);
 
-                string resourceName;
-                var resourceStream = EmbeddedResourceHelper.GetResource("nuPickers.Shared." + folder + "." + fileName, out resourceName);
+                string resourceName = EmbeddedResourceHelper.GetResourceNameFromPath("nuPickers.Shared." + folder + "." + fileName);
+                var resourceStream = EmbeddedResourceHelper.GetResource("nuPickers.Shared." + folder + "." + fileName);
 
                 if (resourceStream != null)
                 {
diff --git a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs b/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
index 1f17508..5ce5fde 100644
--- a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
@@ -1,10 +1,9 @@
 
 using Umbraco.Core.Logging;
-using Umbraco.Web.Models.ContentEditing;
 
 namespace nuPickers.PropertyEditors
 {
-    using nuPickers.Shared.SaveFormat;
+    using Shared.SaveFormat;
     using Umbraco.Core.PropertyEditors;
 
     public abstract class BasePropertyEditor : DataEditor
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
index ce6278c..e5cceb6 100644
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
@@ -1,8 +1,8 @@
 namespace nuPickers.PropertyEditors.DotNetPagedListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors; 
     using Umbraco.Core.Logging;
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
index 6b211fe..fe5b8f6 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -2,8 +2,8 @@
 {
     using Umbraco.Core.Logging;
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
index ed9617a..496337b 100644
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
@@ -1,29 +1,26 @@
-using Umbraco.Core.Logging;
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
 
 namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
 {
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     public class EnumRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
index 276bf0f..bc5dc3f 100644
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
@@ -3,8 +3,8 @@
 namespace nuPickers.PropertyEditors.JsonLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
index 451e0c3..0b85e44 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
@@ -3,8 +3,8 @@
 namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
index 7643e0c..a747b69 100644
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
@@ -3,8 +3,8 @@
 namespace nuPickers.PropertyEditors.LuceneLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 21e5249..87f9bfb 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -1,14 +1,14 @@
-namespace nuPickers.Shared.CustomLabel
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+using nuPickers.Shared.Editor;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
+
+namespace nuPickers.Shared.CustomLabel
 {
-    using Editor;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Linq;
-    using System.Web;
-    using Umbraco.Core.Models;
-    using Umbraco.Core.Models.PublishedContent;
-    using Umbraco.Web.Composing;
-
     internal class CustomLabel
     {
         private string MacroAlias { get; set; }
@@ -31,28 +31,28 @@ internal class CustomLabel
         /// <param name="propertyAlias">property alias</param>
         internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
         {
-            this.MacroAlias = macroAlias;
-            this.ContextId = contextId;
-            this.PropertyAlias = propertyAlias;
+            MacroAlias = macroAlias;
+            ContextId = contextId;
+            PropertyAlias = propertyAlias;
 
             // the macro requires a published context to run in
-            IPublishedContent currentNode = Current.UmbracoContext.ContentCache.GetById(contextId);
+            IPublishedContent currentNode = Current.UmbracoContext.Content.GetById(contextId);
             if (currentNode != null)
             {
                 // current page is published so use this as the macro context
                 HttpContext.Current.Items["pageID"] = contextId;
-                this.HasMacroContext = true;
+                HasMacroContext = true;
             }
             else
             {
                 // fallback nd find first published page to use as host
-                IPublishedContent contextNode = Current.UmbracoContext.ContentCache.GetSingleByXPath(
+                IPublishedContent contextNode = Current.UmbracoContext.Content.GetSingleByXPath(
                     string.Concat("descendant::*[@parentID = ",
                         Current.Services.ContentService.GetRootContent().FirstOrDefault(), "]"));
                 if (contextNode != null)
                 {
                     HttpContext.Current.Items["pageID"] = contextNode.Id;
-                    this.HasMacroContext = true;
+                    HasMacroContext = true;
                 }
             }
         }
@@ -60,7 +60,6 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
         /// <summary>
         /// parses the collection of options, potentially transforming the content of the label
         /// </summary>
-        /// <param name="contextId">the content / media or member being edited</param>
         /// <param name="editorDataItems">collection of options</param>
         /// <returns></returns>
         internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDataItem> editorDataItems)
@@ -74,7 +73,7 @@ internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDa
             {
                 counter++;
                 editorDataItem.Label =
-                    this.ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
+                    ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
             }
 
             return dataItems.Where(x => !string.IsNullOrWhiteSpace(x.Label)); // remove any options without a label
@@ -91,13 +90,13 @@ internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDa
         /// <returns>the output of the macro as a string</returns>
         private string ProcessMacro(string key, string label, string keys, int counter, int total)
         {
-            if (!string.IsNullOrWhiteSpace(this.MacroAlias) && this.HasMacroContext)
+            if (!string.IsNullOrWhiteSpace(MacroAlias) && HasMacroContext)
             {
-                Macro macro = new Macro() {Alias = this.MacroAlias};
+                Macro macro = new Macro {Alias = MacroAlias};
                 Dictionary<string, object> properties = new Dictionary<string, object>();
 
-                properties.Add("contextId".ToLower(), this.ContextId.ToString());
-                properties.Add("propertyAlias".ToLower(), this.PropertyAlias);
+                properties.Add("contextId".ToLower(), ContextId.ToString());
+                properties.Add("propertyAlias".ToLower(), PropertyAlias);
 
                 properties.Add("key", key);
                 properties.Add("label", label);
@@ -106,7 +105,7 @@ private string ProcessMacro(string key, string label, string keys, int counter,
                 properties.Add("counter", counter);
                 properties.Add("total", total);
 
-                label = this.RenderToString(macro, properties);
+                label = RenderToString(macro, properties);
             }
 
             return label;
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
index 5dd9768..0c3894f 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
@@ -1,14 +1,11 @@
-using System.Linq;
-using Umbraco.Core.Models;
+using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Mvc;
 
-namespace nuPickers.Shared
+namespace nuPickers.Shared.CustomLabel
 {
-    using System.Collections.Generic;
-
-    using Umbraco.Web.Editors;
-    using Umbraco.Web.Mvc;
-
     [PluginController("nuPickers")]
     public class CustomLabelApiController : UmbracoAuthorizedJsonController
     {
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 8375285..82c8fe2 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -1,19 +1,12 @@
-namespace nuPickers.Shared.DataSource
-{
-    using Newtonsoft.Json;
-    using nuPickers.PropertyEditors;
-    using nuPickers.Shared.DotNetDataSource;
-    using nuPickers.Shared.EnumDataSource;
-    using nuPickers.Shared.JsonDataSource;
-    using nuPickers.Shared.LuceneDataSource;
-    using nuPickers.Shared.RelationDataSource;
-    using nuPickers.Shared.SqlDataSource;
-    using nuPickers.Shared.XmlDataSource;
+using Newtonsoft.Json;
+using nuPickers.PropertyEditors;
 
+namespace nuPickers.Shared.DataSource
+{
     internal static class DataSource
     {
         internal static IDataSource GetDataSource(string propertyEditorAlias, string dataSourceConfig)
-        {            
+        {
             switch (propertyEditorAlias)
             {
                 case PropertyEditorConstants.DotNetCheckBoxPickerAlias:
@@ -23,14 +16,14 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.DotNetPrefetchListPickerAlias:
                 case PropertyEditorConstants.DotNetRadioButtonPickerAlias:
                 case PropertyEditorConstants.DotNetTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<DotNetDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<DotNetDataSource.DotNetDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.EnumCheckBoxPickerAlias:
                 case PropertyEditorConstants.EnumDropDownPickerAlias:
                 case PropertyEditorConstants.EnumLabelsAlias:
                 case PropertyEditorConstants.EnumPrefetchListPickerAlias:
                 case PropertyEditorConstants.EnumRadioButtonPickerAlias:
-                    return JsonConvert.DeserializeObject<EnumDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<EnumDataSource.EnumDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.JsonCheckBoxPickerAlias:
                 case PropertyEditorConstants.JsonDropDownPickerAlias:
@@ -38,7 +31,7 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.JsonPrefetchListPickerAlias:
                 case PropertyEditorConstants.JsonRadioButtonPickerAlias:
                 case PropertyEditorConstants.JsonTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<JsonDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<JsonDataSource.JsonDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.LuceneCheckBoxPickerAlias:
                 case PropertyEditorConstants.LuceneDropDownPickerAlias:
@@ -46,10 +39,10 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.LucenePrefetchListPickerAlias:
                 case PropertyEditorConstants.LuceneRadioButtonPickerAlias:
                 case PropertyEditorConstants.LuceneTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<LuceneDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<LuceneDataSource.LuceneDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.RelationLabelsAlias:
-                    return JsonConvert.DeserializeObject<RelationDataSource>(dataSourceConfig);                   
+                    return JsonConvert.DeserializeObject<RelationDataSource.RelationDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.SqlCheckBoxPickerAlias:
                 case PropertyEditorConstants.SqlDropDownPickerAlias:
@@ -57,7 +50,7 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.SqlPrefetchListPickerAlias:
                 case PropertyEditorConstants.SqlRadioButtonPickerAlias:
                 case PropertyEditorConstants.SqlTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<SqlDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<SqlDataSource.SqlDataSource>(dataSourceConfig);
 
                 case PropertyEditorConstants.XmlCheckBoxPickerAlias:
                 case PropertyEditorConstants.XmlDropDownPickerAlias:
@@ -65,7 +58,7 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.XmlPrefetchListPickerAlias:
                 case PropertyEditorConstants.XmlRadioButtonPickerAlias:
                 case PropertyEditorConstants.XmlTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<XmlDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<XmlDataSource.XmlDataSource>(dataSourceConfig);
             }
 
             return null;
diff --git a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
index 115d8e2..26c9a7c 100644
--- a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
+++ b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
@@ -1,7 +1,7 @@
 namespace nuPickers.Shared.DataSource
 {
     using Newtonsoft.Json.Linq;
-    using nuPickers.Shared.Editor;
+    using Editor;
     using System.Linq;
     using System.Web.Http;
     using Umbraco.Web.Editors;
@@ -91,7 +91,7 @@ public DataSourceApiResponse GetEditorDataItems([FromUri] int currentId, [FromUr
                                                         dataSource,
                                                         (string)data.config.customLabel,
                                                         (int)data.config.pagedListPicker.itemsPerPage,
-                                                        (int)data.page, 
+                                                        (int)data.page,
                                                         out total);
 
                     response.Total = total;
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
index f662c93..cdf21ae 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
@@ -1,16 +1,14 @@
-using Umbraco.Core.Composing;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+using System.Xml.XPath;
+using nuPickers.Shared.DataSource;
+using nuPickers.Shared.Editor;
+using nuPickers.Shared.Paging;
+using Umbraco.Core.Composing;
 
 namespace nuPickers.Shared.XmlDataSource
 {
-    using DataSource;
-    using nuPickers.Shared.Editor;
-    using Paging;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Xml;
-    using System.Xml.XPath;
-    using Umbraco.Core;
-
     public class XmlDataSource : IDataSource
     {
         public string XmlData { get; set; }
@@ -34,17 +32,17 @@ public class XmlDataSource : IDataSource
         /// <returns></returns>
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
-            return this.GetEditorDataItems(currentId, parentId);
+            return GetEditorDataItems(currentId, parentId);
         }
 
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
-            return this.GetEditorDataItems(currentId, parentId).Where(x => keys.Contains(x.Key));
+            return GetEditorDataItems(currentId, parentId).Where(x => keys.Contains(x.Key));
         }
 
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
         {
-            var editorDataItems = this.GetEditorDataItems(currentId, parentId);
+            var editorDataItems = GetEditorDataItems(currentId, parentId);
 
             total = editorDataItems.Count();
 
@@ -56,7 +54,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
             XmlDocument xmlDocument;
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
 
-            switch (this.XmlData)
+            switch (XmlData)
             {
                 /*
                 case "content":
@@ -74,7 +72,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                 case "url":
                     xmlDocument = new XmlDocument();
 
-                    var url = this.Url.Replace("@contextId", currentId.ToString());
+                    var url = Url.Replace("@contextId", currentId.ToString());
 
                     xmlDocument.LoadXml(Helper.GetDataFromUrl(url));
                     break;
@@ -86,7 +84,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
 
             if (xmlDocument != null)
             {
-                string xPath = this.XPath;
+                string xPath = XPath;
 
                 if (xPath.Contains("$ancestorOrSelf"))
                 {
@@ -94,7 +92,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                     int ancestorOrSelfId = currentId > 0 ? currentId : parentId > 0 ? parentId : -1;
 
                     // if we have a content id, but it's not published in the xml
-                    if (this.XmlData == "content" && ancestorOrSelfId > 0 && xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null)
+                    if (XmlData == "content" && ancestorOrSelfId > 0 && xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null)
                     {
                         // use Umbraco API to get path of all ids above ancestorOrSelfId to root
                         Queue<int> path = new Queue<int>(Current.Services.ContentService.GetById(ancestorOrSelfId).Path.Split(',').Select(x => int.Parse(x)).Reverse().Skip(1));
@@ -104,7 +102,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                         while (xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null);
                     }
 
-                    xPath = this.XPath.Replace("$ancestorOrSelf", string.Concat("/descendant::*[@id='", ancestorOrSelfId, "']"));
+                    xPath = XPath.Replace("$ancestorOrSelf", string.Concat("/descendant::*[@id='", ancestorOrSelfId, "']"));
                 }
 
                 XPathNavigator xPathNavigator = xmlDocument.CreateNavigator();
@@ -122,7 +120,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                         !(xPathNodeIterator.Current.GetAttribute("id", string.Empty) == "-1" &&
                          (xPathNodeIterator.Current.Name == "Media" || xPathNodeIterator.Current.Name == "Members")))
                     {
-                        key = xPathNodeIterator.Current.SelectSingleNode(this.KeyXPath).Value;
+                        key = xPathNodeIterator.Current.SelectSingleNode(KeyXPath).Value;
 
                         // only add item if it has a unique key - failsafe
                         if (!string.IsNullOrWhiteSpace(key) && !keys.Any(x => x == key))
@@ -131,9 +129,9 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                             keys.Add(key); // add key so that it's not reused
 
                             // set default markup to use the configured label XPath
-                            label = xPathNodeIterator.Current.SelectSingleNode(this.LabelXPath).Value;
+                            label = xPathNodeIterator.Current.SelectSingleNode(LabelXPath).Value;
 
-                            editorDataItems.Add(new EditorDataItem()
+                            editorDataItems.Add(new EditorDataItem
                             {
                                 Key = key,
                                 Label = label
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 266c295..9af6bb0 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -324,6 +324,7 @@
     <Compile Include="Extensions\IPublishedContentExtensions.cs" />
     <Compile Include="Extensions\UmbracoHelperExtensions.cs" />
     <Compile Include="Helper.cs" />
+    <Compile Include="NuHandler.cs" />
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
@@ -360,12 +361,6 @@
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
@@ -375,12 +370,6 @@
     <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>

From 745c75c488491aff6d67fd1079776aeaec444178 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 09:57:18 +0100
Subject: [PATCH 15/43] restore original file extensions

---
 source/nuPickers/EmbeddedResource/EmbeddedResource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index fa8d3ff..6ddb2c1 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -15,6 +15,6 @@ internal static class EmbeddedResource
         /// <summary>
         /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = "";
+        internal const string FILE_EXTENSION = ".nu";
     }
 }
\ No newline at end of file

From 61d2340eab8c424b253c45e52e7981971e00fbf7 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 11:15:00 +0100
Subject: [PATCH 16/43] Solve problem with embed resources

---
 source/nuPickers/nuPickerComposer.cs |  9 ++++---
 source/nuPickers/nuPickers.csproj    | 37 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/source/nuPickers/nuPickerComposer.cs b/source/nuPickers/nuPickerComposer.cs
index 9999522..5531b0e 100644
--- a/source/nuPickers/nuPickerComposer.cs
+++ b/source/nuPickers/nuPickerComposer.cs
@@ -1,20 +1,23 @@
 using nuPickers.Components;
+using nuPickers.EmbeddedResource;
 using nuPickers.Shared.DataSource;
 using nuPickers.Shared.EnumDataSource;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Web.Runtime;
 
 namespace nuPickers
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-
-    public class nuPickerComposer :  ICoreComposer
+    [ComposeAfter(typeof(WebFinalComposer))]
+    public class nuPickerComposer :  IComposer
     {
         public void Compose(Composition composition)
         {
+            composition.Register(factory => new EmbeddedResourceController());
+            composition.Components().Append<EmbeddedResourceCompontent>();
             composition.Register<CacheInvalidationComponent>(
                 Lifetime.Singleton);
-            composition.Register<EmbeddedResourceCompontent>(Lifetime.Singleton);
 
             composition.Register<RelationMappingComponent>(Lifetime.Singleton);
             composition.Register(typeof(DataSourceApiController), Lifetime.Request);
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 9af6bb0..c1b9952 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -324,7 +324,6 @@
     <Compile Include="Extensions\IPublishedContentExtensions.cs" />
     <Compile Include="Extensions\UmbracoHelperExtensions.cs" />
     <Compile Include="Helper.cs" />
-    <Compile Include="NuHandler.cs" />
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
@@ -515,24 +514,24 @@
     <EmbeddedResource Include="Shared\PagedListPicker\PagedListPickerEditor.css" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
-    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
-    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
-    <Content Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
-    <Content Include="Shared\CustomLabel\CustomLabelConfig.html" />
-    <Content Include="Shared\CustomLabel\CustomLabelConfigController.js" />
-    <Content Include="Shared\DataSource\DataSourceResource.js" />
-    <Content Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
-    <Content Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
-    <Content Include="Shared\Editor\EditorResource.js" />
-    <Content Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
-    <Content Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
-    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
-    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
-    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
-    <Content Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
-    <Content Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
-    <Content Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
+    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfig.html" />
+    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfigController.js" />
+    <EmbeddedResource Include="Shared\DataSource\DataSourceResource.js" />
+    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
+    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
+    <EmbeddedResource Include="Shared\Editor\EditorResource.js" />
+    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
+    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
+    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
+    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

From 86da12703addc31d23e2c963c562df7be57ebdbf Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 11:50:20 +0100
Subject: [PATCH 17/43] sql dropdown picker

---
 .../SqlDropDownPickerConfiguration.cs         |  22 +++
 .../SqlDropDownPickerConfigurationEditor.cs   | 142 ++++++++++++++++++
 .../SqlDropDownPickerPreValueEditor.cs        |  17 ---
 .../SqlDropDownPickerPropertyEditor.cs        |  13 +-
 source/nuPickers/nuPickers.csproj             |   3 +
 5 files changed, 175 insertions(+), 22 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..1b9fc35
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -0,0 +1,22 @@
+namespace nuPickers.PropertyEditors.SqlDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..ed71bc1
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumDropDownPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.SqlDropDownPicker
+{
+    internal class SqlDropDownPickerConfigurationEditor : ConfigurationEditor<SqlDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlDropDownPickerConfiguration configuration)
+        {
+            var output = new SqlDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs
deleted file mode 100644
index db9a470..0000000
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
index da1d541..3cff56a 100644
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.SqlDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,11 +23,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlDropDownPickerPropertyEditor : BasePropertyEditor
+    public class SqlDropDownPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlDropDownPickerConfigurationEditor();
+
+        public SqlDropDownPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new SqlDropDownPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index c1b9952..a722022 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -376,6 +376,9 @@
     <Compile Include="PickerPropertyValueConverter.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\DataSource\DataSource.cs" />

From c06bd3b416239440404ae501b00a426d305200d6 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 14:58:24 +0100
Subject: [PATCH 18/43] DotNet Pickers

---
 .../DotNetCheckBoxPickerConfiguration.cs      |  26 +++
 ...DotNetCheckBoxPickerConfigurationEditor.cs | 164 ++++++++++++++++++
 .../DotNetCheckBoxPickerPreValueEditor.cs     |  26 ---
 .../DotNetCheckBoxPickerPropertyEditor.cs     |  43 +++--
 .../DotNetDropDownPickerConfiguration.cs      |  17 ++
 ...DotNetDropDownPickerConfigurationEditor.cs | 142 +++++++++++++++
 .../DotNetDropDownPickerPreValueEditor.cs     |  17 --
 .../DotNetDropDownPickerPropertyEditor.cs     |  14 +-
 .../DotNetLabels/DotNetLabelsConfiguration.cs |  30 ++++
 .../DotNetLabelsConfigurationEditor.cs        | 156 +++++++++++++++++
 .../DotNetLabelsPreValueEditor.cs             |  23 ---
 ...ditor.cs => DotNetLabelsPropertyEditor.cs} |  13 +-
 .../DotNetPrefetchListPickerConfiguration.cs  |  32 ++++
 ...etPrefetchListPickerConfigurationEditor.cs | 163 +++++++++++++++++
 .../DotNetPrefetchListPickerPreValueEditor.cs |  26 ---
 .../DotNetPrefetchListPickerPropertyEditor.cs |  19 +-
 .../JsonPrefetchListPickerConfiguration.cs    |   2 +-
 .../CheckBoxPicker/CheckBoxPickerEditor.html  |   8 +-
 .../nuPickers/Shared/DataSource/DataSource.cs |   4 +-
 .../DataSource/DataSourceApiController.cs     |   4 +-
 .../nuPickers/Shared/Labels/LabelsEditor.html |   2 +-
 .../ListPickerSelectablePartial.html          |   2 +-
 .../ListPicker/ListPickerSelectedPartial.html |   2 +-
 .../LuceneDataSource/LuceneDataSource.cs      |   3 +-
 .../RadioButtonPickerEditor.html              |   2 +-
 .../Shared/XmlDataSource/XmlDataSource.cs     |  13 +-
 source/nuPickers/nuPickers.csproj             |  15 +-
 27 files changed, 814 insertions(+), 154 deletions(-)
 create mode 100644 source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs
 rename source/nuPickers/PropertyEditors/DotNetLabels/{DotLabelsPropertyEditor.cs => DotNetLabelsPropertyEditor.cs} (79%)
 create mode 100644 source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
 create mode 100644 source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs

diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..b35bb95
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..4f65f64
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,164 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumCheckBoxPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
+{
+    internal class DotNetCheckBoxPickerConfigurationEditor : ConfigurationEditor<DotNetCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override DotNetCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, DotNetCheckBoxPickerConfiguration configuration)
+        {
+            var output = new DotNetCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                output.SaveFormat = saveFormatObj;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 36e092f..0000000
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetCheckBoxPickerPreValueEditor : ConfigurationEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
index d000977..e22d7b4 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
@@ -1,35 +1,34 @@
-using Umbraco.Core.Models;
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
 
 namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
 {
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
     // EDITOR UI
-    [PropertyType(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetCheckBoxPickerPropertyEditor : BasePropertyEditor
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetCheckBoxPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetCheckBoxPickerConfigurationEditor();
+
+        public DotNetCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new DotNetCheckBoxPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..dd70be3
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
@@ -0,0 +1,17 @@
+namespace nuPickers.PropertyEditors.DotNetDropDownPicker
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class DotNetDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..b775fcf
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumDropDownPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.DotNetDropDownPicker
+{
+    internal class DotNetDropDownPickerConfigurationEditor : ConfigurationEditor<DotNetDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetDropDownPickerConfiguration configuration)
+        {
+            var output = new DotNetDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 29fb8a9..0000000
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
index 4414418..8a27a74 100644
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.DotNetDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,11 +23,13 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetDropDownPickerPropertyEditor : BasePropertyEditor
+    public class DotNetDropDownPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetDropDownPickerConfigurationEditor();
+
+        public DotNetDropDownPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new DotNetDropDownPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs
new file mode 100644
index 0000000..46c58d3
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs
@@ -0,0 +1,30 @@
+namespace nuPickers.PropertyEditors.DotNetLabels
+{
+    using nuPickers.EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class DotNetLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+            true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..ddfbed0
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.DotNetLabels
+{
+    internal class DotNetLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumLabelsConfiguration configuration)
+        {
+            var output = new EnumLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs
deleted file mode 100644
index 49e3f9d..0000000
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
similarity index 79%
rename from source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs
rename to source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
index 8dcea1e..845047e 100644
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.PropertyEditors.DotNetLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.DotNetLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
@@ -7,7 +9,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,11 +24,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetLabelsPropertyEditor : BasePropertyEditor
+    public class DotNetLabelsPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new DotNetLabelsConfigurationEditor();
+
+        public DotNetLabelsPropertyEditor(ILogger logger) : base(logger)
         {
-            return new DotNetLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..b429e48
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
@@ -0,0 +1,32 @@
+namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
+{
+    using Umbraco.Core.PropertyEditors;
+    using nuPickers.EmbeddedResource;
+
+    internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..a42b819
--- /dev/null
+++ b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,163 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.PropertyEditors.EnumPrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
+{
+    internal class DotNetPrefetchListPickerConfigurationEditor : ConfigurationEditor<DotNetPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetPrefetchListPickerConfiguration configuration)
+        {
+            var output = new DotNetPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index a2c1562..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
-
-    internal class DotNetPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
index 6150435..926562a 100644
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using PropertyEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,11 +27,14 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class DotNetPrefetchListPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPrefetchListPickerConfigurationEditor();
+
+
+        public DotNetPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new DotNetPrefetchListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
index 037e2da..b13be99 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -16,7 +16,7 @@ internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
-        [ConfigurationField("prefetchListPicker", "",
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
             EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public object PrefetchListPicker { get; set; }
 
diff --git a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
index 8a1879e..cb21ce2 100644
--- a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
+++ b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
@@ -19,11 +19,11 @@
         <li ng-repeat="option in checkBoxPickerOptions">
 
             <label>
-                <input type="checkbox" 
-                       value="{{option.key}}" 
-                       ng-model="option.isChecked" 
+                <input type="checkbox"
+                       value="{{option.key}}"
+                       ng-model="option.isChecked"
                        ng-change="checkBoxChange()" />
-                <span ng-bind-html-unsafe="option.label"></span>
+                <span ng-bind-html="option.label | unsafe"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 82c8fe2..88e03ff 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -52,13 +52,13 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case PropertyEditorConstants.SqlTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<SqlDataSource.SqlDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.XmlCheckBoxPickerAlias:
+              /*  case PropertyEditorConstants.XmlCheckBoxPickerAlias:
                 case PropertyEditorConstants.XmlDropDownPickerAlias:
                 case PropertyEditorConstants.XmlLabelsAlias:
                 case PropertyEditorConstants.XmlPrefetchListPickerAlias:
                 case PropertyEditorConstants.XmlRadioButtonPickerAlias:
                 case PropertyEditorConstants.XmlTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<XmlDataSource.XmlDataSource>(dataSourceConfig);
+                    return JsonConvert.DeserializeObject<XmlDataSource.XmlDataSource>(dataSourceConfig);*/
             }
 
             return null;
diff --git a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
index 26c9a7c..0e7eefb 100644
--- a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
+++ b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
@@ -12,7 +12,7 @@
     using LuceneDataSource = LuceneDataSource.LuceneDataSource;
     using RelationDataSource = RelationDataSource.RelationDataSource;
     using SqlDataSource = SqlDataSource.SqlDataSource;
-    using XmlDataSource = XmlDataSource.XmlDataSource;
+    //using XmlDataSource = XmlDataSource.XmlDataSource;
 
     [PluginController("nuPickers")]
     public class DataSourceApiController : UmbracoAuthorizedJsonController
@@ -48,7 +48,7 @@ public DataSourceApiResponse GetEditorDataItems([FromUri] int currentId, [FromUr
                 case "LuceneDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<LuceneDataSource>(); break;
                 case "RelationDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<RelationDataSource>(); break;
                 case "SqlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<SqlDataSource>(); break;
-                case "XmlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<XmlDataSource>(); break;
+                //case "XmlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<XmlDataSource>(); break;
             }
 
             if (dataSource != null)
diff --git a/source/nuPickers/Shared/Labels/LabelsEditor.html b/source/nuPickers/Shared/Labels/LabelsEditor.html
index cfbcc32..032bdd0 100644
--- a/source/nuPickers/Shared/Labels/LabelsEditor.html
+++ b/source/nuPickers/Shared/Labels/LabelsEditor.html
@@ -1,6 +1,6 @@
 
 <ul ng-controller="nuPickers.Shared.Labels.LabelsEditorController" class="layout-direction" ng-class="model.config.layoutDirection">
     <li ng-repeat="option in options"
-        ng-bind-html-unsafe="option.label">
+        ng-bind-html="option.label | unsafe">
     </li>
 </ul>
\ No newline at end of file
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
index 8323e8a..cb88c34 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
@@ -7,7 +7,7 @@
     <li ng-repeat="option in selectableOptions"
         ng-hide="model.config.listPicker.hideUsed && !isSelectable(option)"
         ng-class="{lit:lit, disabled:!isValidSelection(option), used:isUsed(option)}">
-        <div class="option-label" ng-bind-html-unsafe="option.label">
+        <div class="option-label" ng-bind-html="option.label | unsafe">
         </div>
 
         <a href=""
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
index 69c4894..a3b23b2 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
@@ -17,7 +17,7 @@
             <div ng-mouseenter="lit = isSortable()"
                  ng-mouseleave="lit = false"
                  ng-class="{'option-label':true, sort:isSortable()}"
-                 ng-bind-html-unsafe="option.label">
+                 ng-bind-html="option.label | unsafe">
             </div>
         </li>
     </ul>
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
index 623cc5d..23abfa6 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
@@ -59,7 +59,8 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
             if(!examineManager.TryGetSearcher(ExamineSearcher, out var searchProvider));
             {
                 examineManager.TryGetIndex(ExamineSearcher.Replace("Searcher", "Index"), out var internalsearch);
-                searchProvider = (ISearcher)internalsearch;
+
+                searchProvider =  internalsearch.GetSearcher();
             }
             if (searchProvider != null)
             {
diff --git a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
index a9a7ce6..10fa40a 100644
--- a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
+++ b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
@@ -11,7 +11,7 @@
                        ng-model="$parent.pickedKey"
                        ng-checked="option.key == $parent.pickedKey" />
 
-                <span ng-bind-html-unsafe="option.label"></span>
+                <span ng-bind-html="option.label | unsafe"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
index cdf21ae..77327d2 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
@@ -5,7 +5,8 @@
 using nuPickers.Shared.DataSource;
 using nuPickers.Shared.Editor;
 using nuPickers.Shared.Paging;
-using Umbraco.Core.Composing;
+using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
 
 namespace nuPickers.Shared.XmlDataSource
 {
@@ -56,19 +57,19 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
 
             switch (XmlData)
             {
-                /*
+
                 case "content":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Document);
+                    xmlDocument = Current.UmbracoHelper.ContentAtXPath(UmbracoObjectTypes.Document.GetName());
                     break;
 
                 case "media":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Media);
+                    xmlDocument =Current.UmbracoHelper.ContentAtXPath(uQuery.UmbracoObjectType.Media);
                     break;
 
                 case "members":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Member);
+                    xmlDocument =Current.UmbracoHelper.ContentAtXPath();
                     break;
-*/
+
                 case "url":
                     xmlDocument = new XmlDocument();
 
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index a722022..de5268d 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -327,9 +327,21 @@
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsConfiguration.cs" />
+    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
@@ -413,7 +425,6 @@
     <Compile Include="Shared\SqlDataSource\SqlDataSource.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSourceApiController.cs" />
     <Compile Include="Shared\TypeaheadListPicker\TypeaheadListPicker.cs" />
-    <Compile Include="Shared\XmlDataSource\XmlDataSource.cs" />
     <Compile Include="Validators\RegexValidator.cs" />
     <Compile Include="Validators\RequiredValidator.cs" />
   </ItemGroup>
@@ -533,8 +544,6 @@
     <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
     <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
     <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

From fad666777ba08d1618d31f511a65c04e34583ce5 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 15:25:10 +0100
Subject: [PATCH 19/43] get list  of all searchers

---
 .../Shared/LuceneDataSource/LuceneDataSourceApiController.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
index 9f7788a..85ddd1b 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
@@ -12,7 +12,10 @@ public class LuceneDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetExamineSearchers()
         {
-            return Examine.ExamineManager.Instance.RegisteredSearchers.Select(x => x.Name);
+            var configuredSearchers = Examine.ExamineManager.Instance.RegisteredSearchers.Select(x => x.Name).ToList();
+            var indexSearchers = Examine.ExamineManager.Instance.Indexes.Select(x => x.GetSearcher().Name).ToList();
+
+            return configuredSearchers.Concat(indexSearchers);
         }
     }
 }
\ No newline at end of file

From 94728d6202856649599cc984e8267660461cabd5 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 15:49:17 +0100
Subject: [PATCH 20/43] adjust namespace, refactor from propertyeditor to
 dataeditor

---
 .../BasePropertyEditor.cs                     |   7 +-
 .../DotNetCheckBoxPickerConfiguration.cs      |  17 ++-
 ...DotNetCheckBoxPickerConfigurationEditor.cs |   3 +-
 .../DotNetCheckBoxPickerDataEditor.cs}        |   6 +-
 .../DotNetDropDownPickerConfiguration.cs      |  11 +-
 ...DotNetDropDownPickerConfigurationEditor.cs |   3 +-
 .../DotNetDropDownPickerDataEditor.cs         |  32 +++++
 .../DotNetLabels/DotNetLabelsConfiguration.cs |  15 ++-
 .../DotNetLabelsConfigurationEditor.cs        |   4 +-
 .../DotNetLabels/DotNetLabelsDataEditor.cs    |  32 +++++
 .../DotNetPagedListPickerConfiguration.cs     |  19 ++-
 ...otNetPagedListPickerConfigurationEditor.cs |   3 +-
 .../DotNetPagedListPickerPropertyEditor.cs    |  38 ++++++
 .../DotNetPrefetchListPickerConfiguration.cs  |  17 ++-
 ...etPrefetchListPickerConfigurationEditor.cs |   3 +-
 .../DotNetPrefetchListPickerPropertyEditor.cs |  37 ++++++
 .../DotNetRadioButtonPickerPreValueEditor.cs  |   0
 .../DotNetRadioButtonPickerPropertyEditor.cs  |   0
 ...DotNetTypeaheadListPickerPreValueEditor.cs |   0
 ...DotNetTypeaheadListPickerPropertyEditor.cs |   0
 .../EnumCheckBoxPickerConfiguration.cs        |  17 ++-
 .../EnumCheckBoxPickerConfigurationEditor.cs  |   2 +-
 .../EnumCheckBoxPickerPropertyEditor.cs       |  48 +++++++
 .../EnumDropDownPickerConfiguration.cs        |  12 +-
 .../EnumDropDownPickerConfigurationEditor.cs  |   9 +-
 .../EnumDropDownPickerPropertyEditor.cs       |  32 +++++
 .../EnumLabels/EnumLabelsConfiguration.cs     |  15 ++-
 .../EnumLabelsConfigurationEditor.cs          |   3 +-
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |  44 +++++++
 .../EnumPrefetchListPickerConfiguration.cs    |  17 ++-
 ...umPrefetchListPickerConfigurationEditor.cs |   3 +-
 .../EnumPrefetchListPropertyEditor.cs         |  51 ++++++++
 .../EnumRadioButtonPickerConfiguration.cs     |  15 ++-
 ...numRadioButtonPickerConfigurationEditor.cs |   3 +-
 .../EnumRadioButtonPickerPropertyEditor.cs    |   2 +-
 .../JsonCheckBoxPickerConfiguration.cs        |  19 ++-
 .../JsonCheckBoxPickerConfigurationEditor.cs  |  17 ++-
 .../JsonCheckBoxPickerPropertyEditor.cs       |  34 +++++
 .../JsonDropDownPickerConfiguration.cs        |  13 +-
 .../JsonDropDownPickerConfigurationEditor.cs  |  16 +--
 .../JsonDropDownPickerPropertyEditor.cs       |  31 +++++
 .../JsonLabels/JsonLabelsConfiguration.cs     |  15 ++-
 .../JsonLabelsConfigurationEditor.cs          |   3 +-
 .../JsonLabels/JsonLabelsPropertyEditor.cs    |  32 +++++
 .../JsonPagedListPickerConfiguration.cs       |  19 ++-
 .../JsonPagedListPickerConfigurationEditor.cs |   3 +-
 .../JsonPagedListPickerPropertyEditor.cs      |  36 ++++++
 .../JsonPrefetchListPickerConfiguration.cs    |  19 ++-
 ...onPrefetchListPickerConfigurationEditor.cs |   3 +-
 .../JsonPrefetchListPickerPropertyEditor.cs   |  37 ++++++
 .../JsonRadioButtonPickerPreValueEditor.cs    |   0
 .../JsonRadioButtonPickerPropertyEditor.cs    |   0
 .../JsonTypeaheadListPickerPreValueEditor.cs  |   0
 .../JsonTypeaheadPickerPropertyEditor.cs      |   0
 .../LuceneCheckBoxPickerPreValueEditor.cs     |   0
 .../LuceneCheckBoxPickerPropertyEditor.cs     |   0
 .../LuceneDropDownPickerConfiguration.cs      |  13 +-
 ...LuceneDropDownPickerConfigurationEditor.cs |   3 +-
 .../LuceneDropDownPickerPropertyEditor.cs     |  32 +++++
 .../LuceneLabels/LuceneLabelsConfiguration.cs |  15 ++-
 .../LuceneLabelsConfigurationEditor.cs        |   2 +-
 .../LuceneLabelsPropertyEditor.cs             |  32 +++++
 .../LucenePagedListPickerConfiguration.cs     |  19 ++-
 ...ucenePagedListPickerConfigurationEditor.cs |   3 +-
 .../LucenePagedListPickerPropertyEditor.cs    |  36 ++++++
 .../LucenePrefetchListPickerPreValueEditor.cs |   0
 .../LucenePrefetchListPickerPropertyEditor.cs |   0
 .../LuceneRadioButtonPickerPreValueEditor.cs  |   0
 .../LuceneRadioButtonPickerPropertyEditor.cs  |   0
 ...LuceneTypeaheadListPickerPreValueEditor.cs |   0
 .../LuceneTypeaheadPickerPropertyEditor.cs    |   0
 .../PickerPropertyEditor.cs                   |   0
 .../PropertyEditorConstants.cs                |   2 +-
 .../RelationLabelsPreValueEditor.cs           |   0
 .../RelationLabelsPropertyEditor.cs           |   0
 .../SqlCheckBoxPickerPreValueEditor.cs        |   0
 .../SqlCheckBoxPickerPropertyEditor.cs        |   0
 .../SqlDropDownPickerConfiguration.cs         |  13 +-
 .../SqlDropDownPickerConfigurationEditor.cs   |   3 +-
 .../SqlDropDownPickerPropertyEditor.cs        |  31 +++++
 .../SqlLabels/SqlLabelsPreValueEditor.cs      |   0
 .../SqlLabels/SqlLabelsPropertyEditor.cs      |   0
 .../SqlPagedListPickerPreValueEditor.cs       |   0
 .../SqlPagedListPickerPropertyEditor.cs       |   0
 .../SqlPrefetchListPickerPreValueEditor.cs    |   0
 .../SqlPrefetchListPickerPropertyEditor.cs    |   0
 .../SqlRadioButtonPickerPreValueEditor.cs     |   0
 .../SqlRadioButtonPickerPropertyEditor.cs     |   0
 .../SqlTypeaheadListPickerPreValueEditor.cs   |   0
 .../SqlTypeaheadListPickerPropertyEditor.cs   |   0
 .../XmlCheckBoxPickerPreValueEditor.cs        |   0
 .../XmlCheckBoxPickerPropertyEditor.cs        |   0
 .../XmlDropDownPickerPreValueEditor.cs        |   0
 .../XmlDropDownPickerPropertyEditor.cs        |   0
 .../XmlLabels/XmlLabelsPreValueEditor.cs      |   0
 .../XmlLabels/XmlLabelsPropertyEditor.cs      |   0
 .../XmlPagedListPickerPreValueEditor.cs       |   0
 .../XmlPagedListPickerPropertyEditor.cs       |   0
 .../XmlPrefetchListPickerPreValueEditor.cs    |   0
 .../XmlPrefetchListPickerPropertyEditor.cs    |   0
 .../XmlRadioButtonPickerPreValueEditor.cs     |   0
 .../XmlRadioButtonPickerPropertyEditor.cs     |   0
 .../XmlTypeaheadListPickerPreValueEditor.cs   |   0
 .../XmlTypeaheadListPickerPropertyEditor.cs   |   0
 .../nuPickers/PickerPropertyValueConverter.cs |   2 +-
 .../DotNetDropDownPickerPropertyEditor.cs     |  35 ------
 .../DotNetLabelsPropertyEditor.cs             |  35 ------
 .../DotNetPagedListPickerPropertyEditor.cs    |  41 ------
 .../DotNetPrefetchListPickerPropertyEditor.cs |  40 ------
 .../EnumCheckBoxPickerPropertyEditor.cs       |  50 --------
 .../EnumDropDownPickerPropertyEditor.cs       |  34 -----
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |  46 -------
 .../EnumPrefetchListPropertyEditor.cs         |  53 --------
 .../JsonCheckBoxPickerPropertyEditor.cs       |  37 ------
 .../JsonDropDownPickerPropertyEditor.cs       |  34 -----
 .../JsonLabels/JsonLabelsPropertyEditor.cs    |  35 ------
 .../JsonPagedListPickerPropertyEditor.cs      |  39 ------
 .../JsonPrefetchListPickerPropertyEditor.cs   |  40 ------
 .../LuceneDropDownPickerPropertyEditor.cs     |  35 ------
 .../LuceneLabelsPropertyEditor.cs             |  35 ------
 .../LucenePagedListPickerPropertyEditor.cs    |  39 ------
 .../SqlDropDownPickerPropertyEditor.cs        |  34 -----
 .../CheckBoxPicker/CheckBoxPickerEditor.html  |   2 +-
 .../nuPickers/Shared/DataSource/DataSource.cs |   2 +-
 .../nuPickers/Shared/Labels/LabelsEditor.html |   2 +-
 .../ListPickerSelectablePartial.html          |   2 +-
 .../ListPicker/ListPickerSelectedPartial.html |   2 +-
 .../RadioButtonPickerEditor.html              |   2 +-
 source/nuPickers/nuPickers.csproj             | 118 +++++++++---------
 129 files changed, 865 insertions(+), 950 deletions(-)
 rename source/nuPickers/{PropertyEditors => DataEditors}/BasePropertyEditor.cs (77%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs (58%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs (98%)
 rename source/nuPickers/{PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs => DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs} (93%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs (61%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetLabels/DotNetLabelsConfiguration.cs (61%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetLabels/DotNetLabelsConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs (58%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs (56%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs (58%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs (99%)
 create mode 100644 source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs (61%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs (96%)
 create mode 100644 source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumLabels/EnumLabelsConfiguration.cs (61%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumLabels/EnumLabelsConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs (56%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs (59%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs (98%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs (97%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs (59%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs (95%)
 create mode 100644 source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs (56%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs (95%)
 create mode 100644 source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonLabels/JsonLabelsConfiguration.cs (63%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonLabels/JsonLabelsConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs (55%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs (55%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs (59%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneLabels/LuceneLabelsConfiguration.cs (62%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneLabels/LuceneLabelsConfigurationEditor.cs (99%)
 create mode 100644 source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs (55%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/PickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/PropertyEditorConstants.cs (98%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/RelationLabels/RelationLabelsPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/RelationLabels/RelationLabelsPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs (59%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs (98%)
 create mode 100644 source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlLabels/SqlLabelsPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlLabels/SqlLabelsPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlLabels/XmlLabelsPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlLabels/XmlLabelsPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs (100%)
 rename source/nuPickers/{PropertyEditors => DataEditors}/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs (100%)
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
 delete mode 100644 source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs

diff --git a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs b/source/nuPickers/DataEditors/BasePropertyEditor.cs
similarity index 77%
rename from source/nuPickers/PropertyEditors/BasePropertyEditor.cs
rename to source/nuPickers/DataEditors/BasePropertyEditor.cs
index 5ce5fde..8ab625b 100644
--- a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
+++ b/source/nuPickers/DataEditors/BasePropertyEditor.cs
@@ -1,11 +1,10 @@
 
+using nuPickers.Shared.SaveFormat;
 using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors
+namespace nuPickers.DataEditors
 {
-    using Shared.SaveFormat;
-    using Umbraco.Core.PropertyEditors;
-
     public abstract class BasePropertyEditor : DataEditor
     {
         protected override IDataValueEditor CreateValueEditor()  => new SaveFormatPropertyValueEditor(Attribute);
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
similarity index 58%
rename from source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
index b35bb95..dd5bcd8 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -1,26 +1,25 @@
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
+{
     internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
     {
 
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public object CheckBoxPicker { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
index 4f65f64..fc43929 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumCheckBoxPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
 {
     internal class DotNetCheckBoxPickerConfigurationEditor : ConfigurationEditor<DotNetCheckBoxPickerConfiguration>
     {
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
similarity index 93%
rename from source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
index e22d7b4..2a817ce 100644
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
@@ -3,7 +3,7 @@
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
 {
     // EDITOR UI
     [DataEditor(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
@@ -22,12 +22,12 @@ namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetCheckBoxPickerPropertyEditor : DataEditor
+    public class DotNetCheckBoxPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new DotNetCheckBoxPickerConfigurationEditor();
 
-        public DotNetCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        public DotNetCheckBoxPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
similarity index 61%
rename from source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
index dd70be3..0690380 100644
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
@@ -1,14 +1,13 @@
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetDropDownPicker
+{
     internal class DotNetDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
index b775fcf..6675efc 100644
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumDropDownPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
+namespace nuPickers.DataEditors.DotNetDropDownPicker
 {
     internal class DotNetDropDownPickerConfigurationEditor : ConfigurationEditor<DotNetDropDownPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..dfb4557
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetDropDownPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetDropDownPickerConfigurationEditor();
+
+        public DotNetDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
similarity index 61%
rename from source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
index 46c58d3..bced04e 100644
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
@@ -1,27 +1,26 @@
-namespace nuPickers.PropertyEditors.DotNetLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetLabels
+{
     internal class DotNetLabelsConfiguration : ValueListConfiguration
     {
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
             true)]
         public string Labels { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction",
-            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
index ddfbed0..8544fc6 100644
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
@@ -2,11 +2,11 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumLabels;
+using nuPickers.DataEditors.EnumLabels;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetLabels
+namespace nuPickers.DataEditors.DotNetLabels
 {
     internal class DotNetLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
new file mode 100644
index 0000000..46e6877
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetLabels
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetLabelsDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new DotNetLabelsConfigurationEditor();
+
+        public DotNetLabelsDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
similarity index 58%
rename from source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
index d802bcf..e25bbed 100644
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
@@ -1,28 +1,27 @@
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetPagedListPicker
+{
     internal class DotNetPagedListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public object PagedListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public object ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
index 8d1a1ce..9a87060 100644
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumPrefetchListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
+namespace nuPickers.DataEditors.DotNetPagedListPicker
 {
     internal class DotNetPagedListPickerConfigurationEditor : ConfigurationEditor<DotNetPagedListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
new file mode 100644
index 0000000..5a5bb95
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
@@ -0,0 +1,38 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetPagedListPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPagedListPickerConfigurationEditor();
+
+
+        public DotNetPagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
similarity index 56%
rename from source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
index b429e48..1c175a7 100644
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
@@ -1,8 +1,7 @@
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
+{
     internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
     {
 
@@ -10,23 +9,23 @@ internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
-            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public object PrefetchListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
index a42b819..ad6db0b 100644
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumPrefetchListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
 {
     internal class DotNetPrefetchListPickerConfigurationEditor : ConfigurationEditor<DotNetPrefetchListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
new file mode 100644
index 0000000..0e1d158
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
@@ -0,0 +1,37 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetPrefetchListPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPrefetchListPickerConfigurationEditor();
+
+
+        public DotNetPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
similarity index 58%
rename from source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
rename to source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
index a7c6f50..4f2e4ba 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -1,25 +1,24 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
+{
     internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public object CheckBoxPicker { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
similarity index 99%
rename from source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
index 026aad0..0ac3353 100644
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -5,7 +5,7 @@
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
 {
     internal class EnumCheckBoxPickerConfigurationEditor : ConfigurationEditor<EnumCheckBoxPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
new file mode 100644
index 0000000..b996be7
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
@@ -0,0 +1,48 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumCheckBoxPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumCheckBoxPickerConfigurationEditor();
+
+        public EnumCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
similarity index 61%
rename from source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
rename to source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
index 821712c..0018b11 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
@@ -1,15 +1,13 @@
-
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.EnumDropDownPicker
+{
     public class EnumDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
similarity index 96%
rename from source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
index 54c7d26..bdeaca6 100644
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
@@ -1,15 +1,12 @@
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
+namespace nuPickers.DataEditors.EnumDropDownPicker
 {
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
     internal class EnumDropDownPickerConfigurationEditor : ConfigurationEditor<EnumDropDownPickerConfiguration>
     {
         public override Dictionary<string, object> ToConfigurationEditor(EnumDropDownPickerConfiguration configuration)
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
new file mode 100644
index 0000000..a1b5938
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
@@ -0,0 +1,32 @@
+
+
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumDropDownPickerPropertyEditor  : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerConfigurationEditor();
+
+        public EnumDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
similarity index 61%
rename from source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
rename to source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
index 78772fc..af5b037 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -1,27 +1,26 @@
-namespace nuPickers.PropertyEditors.EnumLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.EnumLabels
+{
     internal class EnumLabelsConfiguration : ValueListConfiguration
     {
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
             true)]
         public string Labels { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction",
-            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
rename to source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
index c0dc453..8c44b09 100644
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumDropDownPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumLabels
+namespace nuPickers.DataEditors.EnumLabels
 {
     internal class EnumLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
new file mode 100644
index 0000000..34cdfcf
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
@@ -0,0 +1,44 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumLabels
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumLabelsPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
+
+        public EnumLabelsPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
similarity index 56%
rename from source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
index ac971fb..b481721 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -1,31 +1,30 @@
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
+{
     internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
-            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public object PrefetchListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
index 098d9bc..b089c30 100644
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumLabels;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
 {
     internal class EnumPrefetchListPickerConfigurationEditor : ConfigurationEditor<EnumPrefetchListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
new file mode 100644
index 0000000..25d47c1
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -0,0 +1,51 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT" )]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumPrefetchListPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumPrefetchListPickerConfigurationEditor();
+
+
+        public EnumPrefetchListPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
similarity index 59%
rename from source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
rename to source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
index 80b3eca..f5efb7e 100644
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
@@ -1,22 +1,21 @@
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
+{
     internal class EnumRadioButtonPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public object LayoutDirection { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
index 04be629..b2fdfca 100644
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumPrefetchListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
 {
     internal class EnumRadioButtonPickerConfigurationEditor : ConfigurationEditor<EnumRadioButtonPickerConfiguration>
     {
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
similarity index 97%
rename from source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
index 496337b..2af319c 100644
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
@@ -3,7 +3,7 @@
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
 {
     // EDITOR UI
     [DataEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
similarity index 59%
rename from source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
rename to source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
index 1f75ab1..91275ea 100644
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
@@ -1,26 +1,25 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
+{
     internal class JsonCheckBoxPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", " Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", " Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public object CheckBoxPicker { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public object LayoutDirection { get; set; }
 
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
similarity index 95%
rename from source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
index abb8120..b78513b 100644
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
@@ -1,13 +1,12 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
-    using nuPickers.PropertyEditors.JsonDropDownPicker;
-    using Umbraco.Core;
-    using Umbraco.Core.PropertyEditors;
-
     internal class JsonCheckBoxPickerConfigurationEditor : ConfigurationEditor<JsonCheckBoxPickerConfiguration>
     {
         public override Dictionary<string, object> ToConfigurationEditor(JsonCheckBoxPickerConfiguration configuration)
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
new file mode 100644
index 0000000..d833d40
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
@@ -0,0 +1,34 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonCheckBoxPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonCheckBoxPickerConfigurationEditor();
+
+        public JsonCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
similarity index 56%
rename from source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
rename to source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
index f14d662..749333b 100644
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
@@ -1,20 +1,19 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.JsonDropDownPicker
+{
     internal class JsonDropDownPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping",
-            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
similarity index 95%
rename from source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
index cb0ccd5..9172ce8 100644
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
@@ -1,12 +1,12 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonDropDownPicker
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
-    using Umbraco.Core;
-    using Umbraco.Core.PropertyEditors;
-
     internal class JsonDropDownPickerConfigurationEditor : ConfigurationEditor<JsonDropDownPickerConfiguration>
     {
         public override Dictionary<string, object> ToConfigurationEditor(JsonDropDownPickerConfiguration configuration)
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
new file mode 100644
index 0000000..6f80d4e
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
@@ -0,0 +1,31 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonDropDownPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonDropDownPickerConfigurationEditor();
+
+        public JsonDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
similarity index 63%
rename from source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs
rename to source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
index f99d088..72c8458 100644
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
@@ -1,29 +1,28 @@
-namespace nuPickers.PropertyEditors.JsonLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.JsonLabels
+{
     internal class JsonLabelsConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
             HideLabel = true)]
         public object CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
         public object Labels { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction",
-            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public object LayoutDirection { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
rename to source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
index 2f4e857..0921d3d 100644
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumLabels;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.JsonLabels
+namespace nuPickers.DataEditors.JsonLabels
 {
     internal class JsonLabelsConfigurationEditor : ConfigurationEditor<JsonLabelsConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
new file mode 100644
index 0000000..4695d6e
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonLabels
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonLabelsPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonLabelsConfigurationEditor();
+
+        public JsonLabelsPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
similarity index 55%
rename from source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
index e42f080..13338d4 100644
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
@@ -1,35 +1,34 @@
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.JsonPagedListPicker
+{
     internal class JsonPagedListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "Page List Picker",
-            EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public object PagedListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping",
-            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
index 058210c..14366fd 100644
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.DotNetPagedListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
+namespace nuPickers.DataEditors.JsonPagedListPicker
 {
     internal class JsonPagedListPickerConfigurationEditor : ConfigurationEditor<JsonPagedListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
new file mode 100644
index 0000000..28573e2
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
@@ -0,0 +1,36 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonPagedListPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonPagedListPickerConfigurationEditor();
+
+        public JsonPagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
similarity index 55%
rename from source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
index b13be99..bc4a04f 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -1,35 +1,34 @@
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
+{
     internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
-            EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public object PrefetchListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping",
-            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
index 259470f..73ee0c8 100644
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumPrefetchListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
 {
     internal class JsonPrefetchListPickerConfigurationEditor : ConfigurationEditor<JsonPrefetchListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
new file mode 100644
index 0000000..0005691
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
@@ -0,0 +1,37 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonPrefetchListPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonPrefetchListPickerConfigurationEditor();
+
+
+        public JsonPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
similarity index 59%
rename from source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
rename to source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
index a0e4e45..346243d 100644
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
@@ -1,17 +1,16 @@
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.LuceneDropDownPicker
+{
     internal class LuceneDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
index bb75bd7..1f5f364 100644
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.JsonDropDownPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
+namespace nuPickers.DataEditors.LuceneDropDownPicker
 {
     internal class LuceneDropDownPickerConfigurationEditor : ConfigurationEditor<LuceneDropDownPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
new file mode 100644
index 0000000..6424bdb
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneDropDownPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneDropDownPickerConfigurationEditor();
+
+        public LuceneDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+
+}
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
similarity index 62%
rename from source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs
rename to source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
index 6c5fd8a..f5dd2b2 100644
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
@@ -1,23 +1,22 @@
-namespace nuPickers.PropertyEditors.LuceneLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.LuceneLabels
+{
     internal class LuceneLabelsConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
         public string Labels { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
similarity index 99%
rename from source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
rename to source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
index 19af5c9..2e73819 100644
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
@@ -5,7 +5,7 @@
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.LuceneLabels
+namespace nuPickers.DataEditors.LuceneLabels
 {
     internal class LuceneLabelsConfigurationEditor : ConfigurationEditor<LuceneLabelsConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
new file mode 100644
index 0000000..cf39962
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneLabels
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneLabelsPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneLabelsConfigurationEditor();
+
+        public LuceneLabelsPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
similarity index 55%
rename from source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
rename to source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
index 2480d1e..9e0a86a 100644
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -1,35 +1,34 @@
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.LucenePagedListPicker
+{
     internal class LucenePagedListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
         [ConfigurationField("dataSource", "Data Source",
-            EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Custom Label",
-            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "Page List Picker",
-            EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public object PagedListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
             HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping",
-            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format",
-            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
index 1800d58..c742230 100644
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.JsonPagedListPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
+namespace nuPickers.DataEditors.LucenePagedListPicker
 {
     internal class LucenePagedListPickerConfigurationEditor : ConfigurationEditor<LucenePagedListPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
new file mode 100644
index 0000000..1d18856
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
@@ -0,0 +1,36 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LucenePagedListPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePagedListPickerConfigurationEditor();
+
+        public LucenePagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs b/source/nuPickers/DataEditors/PickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/PickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/PropertyEditorConstants.cs b/source/nuPickers/DataEditors/PropertyEditorConstants.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/PropertyEditorConstants.cs
rename to source/nuPickers/DataEditors/PropertyEditorConstants.cs
index 0b497b8..d832497 100644
--- a/source/nuPickers/PropertyEditors/PropertyEditorConstants.cs
+++ b/source/nuPickers/DataEditors/PropertyEditorConstants.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors
+namespace nuPickers.DataEditors
 {
     /// <summary>
     /// Class used to define constants (avoided more generic Contants class as conflicts with the use of ClientDependency)
diff --git a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPreValueEditor.cs
rename to source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
similarity index 59%
rename from source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
rename to source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
index 1b9fc35..c1b03cc 100644
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -1,21 +1,20 @@
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
+namespace nuPickers.DataEditors.SqlDropDownPicker
+{
     internal class SqlDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
 
     }
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
similarity index 98%
rename from source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
rename to source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
index ed71bc1..0d704c4 100644
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
@@ -2,11 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using nuPickers.PropertyEditors.EnumDropDownPicker;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
+namespace nuPickers.DataEditors.SqlDropDownPicker
 {
     internal class SqlDropDownPickerConfigurationEditor : ConfigurationEditor<SqlDropDownPickerConfiguration>
     {
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
new file mode 100644
index 0000000..2f73624
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
@@ -0,0 +1,31 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class SqlDropDownPickerPropertyEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlDropDownPickerConfigurationEditor();
+
+        public SqlDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
diff --git a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
similarity index 100%
rename from source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index 57e10fb..c668f9d 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Web;
+using nuPickers.DataEditors;
 using Umbraco.Web.Composing;
 
 namespace nuPickers
 {
-    using nuPickers.PropertyEditors;
     using System.Linq;
     using Umbraco.Core.Models;
     using Umbraco.Core.Models.PublishedContent;
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 8a27a74..0000000
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetDropDownPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new DotNetDropDownPickerConfigurationEditor();
-
-        public DotNetDropDownPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
deleted file mode 100644
index 845047e..0000000
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.DotNetLabels
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetLabelsPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new DotNetLabelsConfigurationEditor();
-
-        public DotNetLabelsPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
deleted file mode 100644
index e5cceb6..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
-{
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors; 
-    using Umbraco.Core.Logging;
-
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPagedListPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new DotNetPagedListPickerConfigurationEditor();
-
-
-        public DotNetPagedListPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
deleted file mode 100644
index 926562a..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
-{
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPrefetchListPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new DotNetPrefetchListPickerConfigurationEditor();
-
-
-        public DotNetPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index 361997f..0000000
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-    using Umbraco.Core.Logging;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
-        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" +
-        EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
-        EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumCheckBoxPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new EnumCheckBoxPickerConfigurationEditor();
-
-        public EnumCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 6a7dae8..0000000
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-    using Umbraco.Core.Logging;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumDropDownPickerPropertyEditor  : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerConfigurationEditor();
-
-        public EnumDropDownPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
deleted file mode 100644
index bfe56cf..0000000
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumLabels
-{
-    using Umbraco.Core.Logging;
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
-        EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
-        EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumLabelsPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
-
-        public EnumLabelsPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
deleted file mode 100644
index fe5b8f6..0000000
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
-{
-    using Umbraco.Core.Logging;
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
-        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT" )]
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" +
-        EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css,
-        EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
-        EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript,
-        EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumPrefetchListPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new EnumPrefetchListPickerConfigurationEditor();
-
-
-        public EnumPrefetchListPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index 7085f40..0000000
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonCheckBoxPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonCheckBoxPickerConfigurationEditor();
-
-        public JsonCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 2374fad..0000000
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonDropDownPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonDropDownPickerConfigurationEditor();
-
-        public JsonDropDownPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
deleted file mode 100644
index bc5dc3f..0000000
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.JsonLabels
-{
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonLabelsPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonLabelsConfigurationEditor();
-
-        public JsonLabelsPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
deleted file mode 100644
index caf06d2..0000000
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPagedListPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonPagedListPickerConfigurationEditor();
-
-        public JsonPagedListPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
deleted file mode 100644
index 0b85e44..0000000
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
-{
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPrefetchListPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new JsonPrefetchListPickerConfigurationEditor();
-
-
-        public JsonPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 873ef7b..0000000
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneDropDownPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneDropDownPickerConfigurationEditor();
-
-        public LuceneDropDownPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-
-}
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
deleted file mode 100644
index a747b69..0000000
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.LuceneLabels
-{
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneLabelsPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneLabelsConfigurationEditor();
-
-        public LuceneLabelsPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
deleted file mode 100644
index 228e75f..0000000
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePagedListPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePagedListPickerConfigurationEditor();
-
-        public LucenePagedListPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 3cff56a..0000000
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Umbraco.Core.Logging;
-
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlDropDownPickerPropertyEditor : DataEditor
-    {
-        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlDropDownPickerConfigurationEditor();
-
-        public SqlDropDownPickerPropertyEditor(ILogger logger) : base(logger)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
index cb21ce2..0796e6b 100644
--- a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
+++ b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
@@ -23,7 +23,7 @@
                        value="{{option.key}}"
                        ng-model="option.isChecked"
                        ng-change="checkBoxChange()" />
-                <span ng-bind-html="option.label | unsafe"></span>
+                <span ng-bind-html="option.label"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 88e03ff..4145d59 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using nuPickers.PropertyEditors;
+using nuPickers.DataEditors;
 
 namespace nuPickers.Shared.DataSource
 {
diff --git a/source/nuPickers/Shared/Labels/LabelsEditor.html b/source/nuPickers/Shared/Labels/LabelsEditor.html
index 032bdd0..d7bd276 100644
--- a/source/nuPickers/Shared/Labels/LabelsEditor.html
+++ b/source/nuPickers/Shared/Labels/LabelsEditor.html
@@ -1,6 +1,6 @@
 
 <ul ng-controller="nuPickers.Shared.Labels.LabelsEditorController" class="layout-direction" ng-class="model.config.layoutDirection">
     <li ng-repeat="option in options"
-        ng-bind-html="option.label | unsafe">
+        ng-bind-html="option.label">
     </li>
 </ul>
\ No newline at end of file
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
index cb88c34..eeb7e85 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
@@ -7,7 +7,7 @@
     <li ng-repeat="option in selectableOptions"
         ng-hide="model.config.listPicker.hideUsed && !isSelectable(option)"
         ng-class="{lit:lit, disabled:!isValidSelection(option), used:isUsed(option)}">
-        <div class="option-label" ng-bind-html="option.label | unsafe">
+        <div class="option-label" ng-bind-html="option.label">
         </div>
 
         <a href=""
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
index a3b23b2..3f017a7 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
@@ -17,7 +17,7 @@
             <div ng-mouseenter="lit = isSortable()"
                  ng-mouseleave="lit = false"
                  ng-class="{'option-label':true, sort:isSortable()}"
-                 ng-bind-html="option.label | unsafe">
+                 ng-bind-html="option.label">
             </div>
         </li>
     </ul>
diff --git a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
index 10fa40a..4d797bc 100644
--- a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
+++ b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
@@ -11,7 +11,7 @@
                        ng-model="$parent.pickedKey"
                        ng-checked="option.key == $parent.pickedKey" />
 
-                <span ng-bind-html="option.label | unsafe"></span>
+                <span ng-bind-html="option.label"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index de5268d..7153e92 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -326,71 +326,71 @@
     <Compile Include="Helper.cs" />
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsConfiguration.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsConfiguration.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsConfiguration.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
+    <Compile Include="DataEditors\BasePropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\PropertyEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PickerPropertyValueConverter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\DataSource\DataSource.cs" />

From 0e5fb1b09c6437b2aa0221e3ea7587dc1dfff0ae Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 16:06:10 +0100
Subject: [PATCH 21/43] Migrate next DataEditors, refactor names,

---
 ...torConstants.cs => DataEditorConstants.cs} |   4 +-
 .../DotNetCheckBoxPickerDataEditor.cs         |   2 +-
 .../DotNetDropDownPickerDataEditor.cs         |   2 +-
 .../DotNetLabels/DotNetLabelsDataEditor.cs    |   2 +-
 ....cs => DotNetPagedListPickerDataEditor.cs} |   6 +-
 ... => DotNetPrefetchListPickerDataEditor.cs} |   6 +-
 .../DotNetRadioButtonPickerConfiguration.cs   |  21 +++
 ...NetRadioButtonPickerConfigurationEditor.cs | 150 ++++++++++++++++
 .../DotNetRadioButtonPickerPreValueEditor.cs  |  23 ---
 .../DotNetRadioButtonPickerPropertyEditor.cs  |  33 ----
 .../DotnetRadioButtonPickerDataEditor.cs      |  35 ++++
 ...tNetTypeaheadListPickerPreConfiguration.cs |  27 +++
 ...peaheadListPickerPreConfigurationEditor.cs | 161 ++++++++++++++++++
 ...DotNetTypeaheadListPickerPreValueEditor.cs |  26 ---
 ...DotNetTypeaheadListPickerPropertyEditor.cs |  52 +++---
 .../EnumCheckBoxPickerPropertyEditor.cs       |   2 +-
 .../EnumDropDownPickerPropertyEditor.cs       |   2 +-
 .../EnumLabels/EnumLabelsPropertyEditor.cs    |   2 +-
 .../EnumPrefetchListPropertyEditor.cs         |   2 +-
 .../EnumRadioButtonPickerPropertyEditor.cs    |   2 +-
 .../JsonCheckBoxPickerPropertyEditor.cs       |   2 +-
 .../JsonDropDownPickerPropertyEditor.cs       |   2 +-
 .../JsonLabels/JsonLabelsPropertyEditor.cs    |   2 +-
 .../JsonPagedListPickerPropertyEditor.cs      |   2 +-
 .../JsonPrefetchListPickerPropertyEditor.cs   |   2 +-
 .../LuceneDropDownPickerPropertyEditor.cs     |   2 +-
 .../LuceneLabelsPropertyEditor.cs             |   2 +-
 .../LucenePagedListPickerPropertyEditor.cs    |   2 +-
 .../SqlDropDownPickerPropertyEditor.cs        |   2 +-
 .../nuPickers/PickerPropertyValueConverter.cs |  68 ++++----
 .../nuPickers/Shared/DataSource/DataSource.cs |  62 +++----
 source/nuPickers/nuPickers.csproj             |  12 +-
 32 files changed, 520 insertions(+), 200 deletions(-)
 rename source/nuPickers/DataEditors/{PropertyEditorConstants.cs => DataEditorConstants.cs} (97%)
 rename source/nuPickers/DataEditors/DotNetPagedListPicker/{DotNetPagedListPickerPropertyEditor.cs => DotNetPagedListPickerDataEditor.cs} (89%)
 rename source/nuPickers/DataEditors/DotNetPrefetchListPicker/{DotNetPrefetchListPickerPropertyEditor.cs => DotNetPrefetchListPickerDataEditor.cs} (88%)
 create mode 100644 source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
 create mode 100644 source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs
 create mode 100644 source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs

diff --git a/source/nuPickers/DataEditors/PropertyEditorConstants.cs b/source/nuPickers/DataEditors/DataEditorConstants.cs
similarity index 97%
rename from source/nuPickers/DataEditors/PropertyEditorConstants.cs
rename to source/nuPickers/DataEditors/DataEditorConstants.cs
index d832497..cf80206 100644
--- a/source/nuPickers/DataEditors/PropertyEditorConstants.cs
+++ b/source/nuPickers/DataEditors/DataEditorConstants.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// Class used to define constants (avoided more generic Contants class as conflicts with the use of ClientDependency)
     /// </summary>
-    public static class PropertyEditorConstants
+    public static class DataEditorConstants
     {
         public const string DotNetCheckBoxPickerAlias = "nuPickers.DotNetCheckBoxPicker";
         public const string DotNetDropDownPickerAlias = "nuPickers.DotNetDropDownPicker";
@@ -51,6 +51,6 @@ public static class PropertyEditorConstants
         public const string XmlPagedListPickerAlias = "nuPickers.XmlPagedListPicker";
         public const string XmlPrefetchListPickerAlias = "nuPickers.XmlPrefetchListPicker";
         public const string XmlRadioButtonPickerAlias = "nuPickers.XmlRadioButtonPicker";
-        public const string XmlTypeaheadListPickerAlias = "nuPickers.XmlTypeaheadListPicker";        
+        public const string XmlTypeaheadListPickerAlias = "nuPickers.XmlTypeaheadListPicker";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
index 2a817ce..e996c64 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.DotNetCheckBoxPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
index dfb4557..9322976 100644
--- a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.DotNetDropDownPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
index 46e6877..9365a0e 100644
--- a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.DotNetLabels
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs
similarity index 89%
rename from source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs
index 5a5bb95..41265e1 100644
--- a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.DotNetPagedListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
@@ -25,13 +25,13 @@ namespace nuPickers.DataEditors.DotNetPagedListPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPagedListPickerPropertyEditor : DataEditor
+    public class DotNetPagedListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new DotNetPagedListPickerConfigurationEditor();
 
 
-        public DotNetPagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        public DotNetPagedListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs
similarity index 88%
rename from source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs
index 0e1d158..f5a2ccd 100644
--- a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.DotNetPrefetchListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
@@ -24,13 +24,13 @@ namespace nuPickers.DataEditors.DotNetPrefetchListPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPrefetchListPickerPropertyEditor : DataEditor
+    public class DotNetPrefetchListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new DotNetPrefetchListPickerConfigurationEditor();
 
 
-        public DotNetPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
+        public DotNetPrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..ce2254c
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs
@@ -0,0 +1,21 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    internal class DotNetRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..5c6bd64
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,150 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.EnumRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    internal class DotNetRadioButtonPickerConfigurationEditor : ConfigurationEditor<DotNetRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetRadioButtonPickerConfiguration configuration)
+        {
+            var output = new DotNetRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 94f0c44..0000000
--- a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
deleted file mode 100644
index a288c8d..0000000
--- a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetRadioButtonPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetRadioButtonPickerAlias, "nuPickers: DotNet RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotnetRadioButtonPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetRadioButtonPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs
new file mode 100644
index 0000000..48eb5eb
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetRadioButtonPickerAlias, "nuPickers: DotNet RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotnetRadioButtonPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetRadioButtonPickerConfigurationEditor();
+
+
+        public DotnetRadioButtonPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs
new file mode 100644
index 0000000..090dcbe
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
+    internal class DotNetTypeaheadListPickerPreConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs
new file mode 100644
index 0000000..118acb9
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs
@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
+    internal class DotNetTypeaheadListPickerPreConfigurationEditor : ConfigurationEditor<DotNetTypeaheadListPickerPreConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetTypeaheadListPickerPreConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetTypeaheadListPickerPreConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetTypeaheadListPickerPreConfiguration configuration)
+        {
+            var output = new DotNetTypeaheadListPickerPreConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index 30e26d8..0000000
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
index 3662cc5..4269c50 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
@@ -1,36 +1,38 @@
-namespace nuPickers.PropertyEditors.DotNetTypeaheadListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
 
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetTypeaheadListPickerAlias, "nuPickers: DotNet TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(DataEditorConstants.DotNetTypeaheadListPickerAlias, "nuPickers: DotNet TypeaheadList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetTypeaheadPickerPropertyEditor : BasePropertyEditor
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetTypeaheadPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetTypeaheadListPickerPreConfigurationEditor();
+
+
+        public DotNetTypeaheadPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new DotNetTypeaheadListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
index b996be7..cf9865c 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.EnumCheckBoxPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
+    [DataEditor(DataEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
         EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
index a1b5938..a21c5c9 100644
--- a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
@@ -8,7 +8,7 @@
 namespace nuPickers.DataEditors.EnumDropDownPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
index 34cdfcf..353f5ec 100644
--- a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.EnumLabels
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
+    [DataEditor(DataEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
         EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
index 25d47c1..293c01d 100644
--- a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.EnumPrefetchListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
+    [DataEditor(DataEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
         EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT" )]
     [PropertyEditorAsset(ClientDependencyType.Css,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
index 2af319c..1ff9e0c 100644
--- a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.EnumRadioButtonPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
index d833d40..cb0f143 100644
--- a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.JsonCheckBoxPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
index 6f80d4e..dc39cda 100644
--- a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.JsonDropDownPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
index 4695d6e..6604791 100644
--- a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.JsonLabels
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
index 28573e2..5b8b947 100644
--- a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.JsonPagedListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
index 0005691..24d9fca 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.JsonPrefetchListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
index 6424bdb..2595a98 100644
--- a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.LuceneDropDownPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
index cf39962..1ae3232 100644
--- a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.LuceneLabels
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
index 1d18856..67a86ae 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.LucenePagedListPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
index 2f73624..67abfb9 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
@@ -6,7 +6,7 @@
 namespace nuPickers.DataEditors.SqlDropDownPicker
 {
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index c668f9d..b8bdcbf 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -37,40 +37,40 @@ public override bool IsConverter(IPublishedPropertyType propertyType)
         public static bool IsPicker(string propertyEditorAlias)
         {
             return new string[] {
-                        PropertyEditorConstants.DotNetCheckBoxPickerAlias,
-                        PropertyEditorConstants.DotNetDropDownPickerAlias,
-                        PropertyEditorConstants.DotNetPagedListPickerAlias,
-                        PropertyEditorConstants.DotNetPrefetchListPickerAlias,
-                        PropertyEditorConstants.DotNetRadioButtonPickerAlias,
-                        PropertyEditorConstants.DotNetTypeaheadListPickerAlias,
-                        PropertyEditorConstants.EnumCheckBoxPickerAlias,
-                        PropertyEditorConstants.EnumDropDownPickerAlias,
-                        PropertyEditorConstants.EnumPrefetchListPickerAlias,
-                        PropertyEditorConstants.EnumRadioButtonPickerAlias,
-                        PropertyEditorConstants.JsonCheckBoxPickerAlias,
-                        PropertyEditorConstants.JsonDropDownPickerAlias,
-                        PropertyEditorConstants.JsonPagedListPickerAlias,
-                        PropertyEditorConstants.JsonPrefetchListPickerAlias,
-                        PropertyEditorConstants.JsonRadioButtonPickerAlias,
-                        PropertyEditorConstants.JsonTypeaheadListPickerAlias,
-                        PropertyEditorConstants.LuceneCheckBoxPickerAlias,
-                        PropertyEditorConstants.LuceneDropDownPickerAlias,
-                        PropertyEditorConstants.LucenePagedListPickerAlias,
-                        PropertyEditorConstants.LucenePrefetchListPickerAlias,
-                        PropertyEditorConstants.LuceneRadioButtonPickerAlias,
-                        PropertyEditorConstants.LuceneTypeaheadListPickerAlias,
-                        PropertyEditorConstants.SqlCheckBoxPickerAlias,
-                        PropertyEditorConstants.SqlDropDownPickerAlias,
-                        PropertyEditorConstants.SqlPagedListPickerAlias,
-                        PropertyEditorConstants.SqlPrefetchListPickerAlias,
-                        PropertyEditorConstants.SqlRadioButtonPickerAlias,
-                        PropertyEditorConstants.SqlTypeaheadListPickerAlias,
-                        PropertyEditorConstants.XmlCheckBoxPickerAlias,
-                        PropertyEditorConstants.XmlDropDownPickerAlias,
-                        PropertyEditorConstants.XmlPagedListPickerAlias,
-                        PropertyEditorConstants.XmlPrefetchListPickerAlias,
-                        PropertyEditorConstants.XmlRadioButtonPickerAlias,
-                        PropertyEditorConstants.XmlTypeaheadListPickerAlias
+                        DataEditorConstants.DotNetCheckBoxPickerAlias,
+                        DataEditorConstants.DotNetDropDownPickerAlias,
+                        DataEditorConstants.DotNetPagedListPickerAlias,
+                        DataEditorConstants.DotNetPrefetchListPickerAlias,
+                        DataEditorConstants.DotNetRadioButtonPickerAlias,
+                        DataEditorConstants.DotNetTypeaheadListPickerAlias,
+                        DataEditorConstants.EnumCheckBoxPickerAlias,
+                        DataEditorConstants.EnumDropDownPickerAlias,
+                        DataEditorConstants.EnumPrefetchListPickerAlias,
+                        DataEditorConstants.EnumRadioButtonPickerAlias,
+                        DataEditorConstants.JsonCheckBoxPickerAlias,
+                        DataEditorConstants.JsonDropDownPickerAlias,
+                        DataEditorConstants.JsonPagedListPickerAlias,
+                        DataEditorConstants.JsonPrefetchListPickerAlias,
+                        DataEditorConstants.JsonRadioButtonPickerAlias,
+                        DataEditorConstants.JsonTypeaheadListPickerAlias,
+                        DataEditorConstants.LuceneCheckBoxPickerAlias,
+                        DataEditorConstants.LuceneDropDownPickerAlias,
+                        DataEditorConstants.LucenePagedListPickerAlias,
+                        DataEditorConstants.LucenePrefetchListPickerAlias,
+                        DataEditorConstants.LuceneRadioButtonPickerAlias,
+                        DataEditorConstants.LuceneTypeaheadListPickerAlias,
+                        DataEditorConstants.SqlCheckBoxPickerAlias,
+                        DataEditorConstants.SqlDropDownPickerAlias,
+                        DataEditorConstants.SqlPagedListPickerAlias,
+                        DataEditorConstants.SqlPrefetchListPickerAlias,
+                        DataEditorConstants.SqlRadioButtonPickerAlias,
+                        DataEditorConstants.SqlTypeaheadListPickerAlias,
+                        DataEditorConstants.XmlCheckBoxPickerAlias,
+                        DataEditorConstants.XmlDropDownPickerAlias,
+                        DataEditorConstants.XmlPagedListPickerAlias,
+                        DataEditorConstants.XmlPrefetchListPickerAlias,
+                        DataEditorConstants.XmlRadioButtonPickerAlias,
+                        DataEditorConstants.XmlTypeaheadListPickerAlias
                     }
                  .Contains(propertyEditorAlias);
         }
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 4145d59..7a54f9d 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -9,47 +9,47 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
         {
             switch (propertyEditorAlias)
             {
-                case PropertyEditorConstants.DotNetCheckBoxPickerAlias:
-                case PropertyEditorConstants.DotNetDropDownPickerAlias:
-                case PropertyEditorConstants.DotNetLabelsAlias:
-                case PropertyEditorConstants.DotNetPagedListPickerAlias:
-                case PropertyEditorConstants.DotNetPrefetchListPickerAlias:
-                case PropertyEditorConstants.DotNetRadioButtonPickerAlias:
-                case PropertyEditorConstants.DotNetTypeaheadListPickerAlias:
+                case DataEditorConstants.DotNetCheckBoxPickerAlias:
+                case DataEditorConstants.DotNetDropDownPickerAlias:
+                case DataEditorConstants.DotNetLabelsAlias:
+                case DataEditorConstants.DotNetPagedListPickerAlias:
+                case DataEditorConstants.DotNetPrefetchListPickerAlias:
+                case DataEditorConstants.DotNetRadioButtonPickerAlias:
+                case DataEditorConstants.DotNetTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<DotNetDataSource.DotNetDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.EnumCheckBoxPickerAlias:
-                case PropertyEditorConstants.EnumDropDownPickerAlias:
-                case PropertyEditorConstants.EnumLabelsAlias:
-                case PropertyEditorConstants.EnumPrefetchListPickerAlias:
-                case PropertyEditorConstants.EnumRadioButtonPickerAlias:
+                case DataEditorConstants.EnumCheckBoxPickerAlias:
+                case DataEditorConstants.EnumDropDownPickerAlias:
+                case DataEditorConstants.EnumLabelsAlias:
+                case DataEditorConstants.EnumPrefetchListPickerAlias:
+                case DataEditorConstants.EnumRadioButtonPickerAlias:
                     return JsonConvert.DeserializeObject<EnumDataSource.EnumDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.JsonCheckBoxPickerAlias:
-                case PropertyEditorConstants.JsonDropDownPickerAlias:
-                case PropertyEditorConstants.JsonLabelsAlias:
-                case PropertyEditorConstants.JsonPrefetchListPickerAlias:
-                case PropertyEditorConstants.JsonRadioButtonPickerAlias:
-                case PropertyEditorConstants.JsonTypeaheadListPickerAlias:
+                case DataEditorConstants.JsonCheckBoxPickerAlias:
+                case DataEditorConstants.JsonDropDownPickerAlias:
+                case DataEditorConstants.JsonLabelsAlias:
+                case DataEditorConstants.JsonPrefetchListPickerAlias:
+                case DataEditorConstants.JsonRadioButtonPickerAlias:
+                case DataEditorConstants.JsonTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<JsonDataSource.JsonDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.LuceneCheckBoxPickerAlias:
-                case PropertyEditorConstants.LuceneDropDownPickerAlias:
-                case PropertyEditorConstants.LuceneLabelsAlias:
-                case PropertyEditorConstants.LucenePrefetchListPickerAlias:
-                case PropertyEditorConstants.LuceneRadioButtonPickerAlias:
-                case PropertyEditorConstants.LuceneTypeaheadListPickerAlias:
+                case DataEditorConstants.LuceneCheckBoxPickerAlias:
+                case DataEditorConstants.LuceneDropDownPickerAlias:
+                case DataEditorConstants.LuceneLabelsAlias:
+                case DataEditorConstants.LucenePrefetchListPickerAlias:
+                case DataEditorConstants.LuceneRadioButtonPickerAlias:
+                case DataEditorConstants.LuceneTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<LuceneDataSource.LuceneDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.RelationLabelsAlias:
+                case DataEditorConstants.RelationLabelsAlias:
                     return JsonConvert.DeserializeObject<RelationDataSource.RelationDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.SqlCheckBoxPickerAlias:
-                case PropertyEditorConstants.SqlDropDownPickerAlias:
-                case PropertyEditorConstants.SqlLabelsAlias:
-                case PropertyEditorConstants.SqlPrefetchListPickerAlias:
-                case PropertyEditorConstants.SqlRadioButtonPickerAlias:
-                case PropertyEditorConstants.SqlTypeaheadListPickerAlias:
+                case DataEditorConstants.SqlCheckBoxPickerAlias:
+                case DataEditorConstants.SqlDropDownPickerAlias:
+                case DataEditorConstants.SqlLabelsAlias:
+                case DataEditorConstants.SqlPrefetchListPickerAlias:
+                case DataEditorConstants.SqlRadioButtonPickerAlias:
+                case DataEditorConstants.SqlTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<SqlDataSource.SqlDataSource>(dataSourceConfig);
 
               /*  case PropertyEditorConstants.XmlCheckBoxPickerAlias:
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 7153e92..a93afc0 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -314,6 +314,12 @@
     <Compile Include="Components\EmbeddedResourceCompontent.cs" />
     <Compile Include="Components\nuPickerCompontent.cs" />
     <Compile Include="Components\RelationMappingComponent.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotnetRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPropertyEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
@@ -337,10 +343,10 @@
     <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfiguration.cs" />
     <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerDataEditor.cs" />
     <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
     <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
@@ -381,7 +387,7 @@
     <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
     <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
-    <Compile Include="DataEditors\PropertyEditorConstants.cs" />
+    <Compile Include="DataEditors\DataEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
     </Compile>

From ce4f7a3f66c46b39d7883817a64b4e8bdf7dd002 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 16:24:28 +0100
Subject: [PATCH 22/43] migrate next DataType Editors, refactor names

---
 ....cs => DotNetTypeaheadPickerDataEditor.cs} |   0
 ...tor.cs => EnumCheckBoxPickerDataEditor.cs} |   4 +-
 ...tor.cs => EnumDropDownPickerDataEditor.cs} |   4 +-
 ...pertyEditor.cs => EnumLabelsDataEditor.cs} |   4 +-
 ...cs => EnumPrefetchListPickerDataEditor.cs} |   4 +-
 ....cs => EnumRadioButtonPickerDataEditor.cs} |   4 +-
 ...tor.cs => JsonCheckBoxPickerDataEditor.cs} |   4 +-
 ...tor.cs => JsonDropDownPickerDataEditor.cs} |   4 +-
 ...pertyEditor.cs => JsonLabelsDataEditor.cs} |   4 +-
 ...or.cs => JsonPagedListPickerDataEditor.cs} |   4 +-
 ...cs => JsonPrefetchListPickerDataEditor.cs} |   4 +-
 .../JsonRadioButtonPickerConfiguration.cs     |  24 +++
 ...sonRadioButtonPickerConfigurationEditor.cs | 156 ++++++++++++++++++
 .../JsonRadioButtonPickerDataEditor.cs        |  35 ++++
 .../JsonRadioButtonPickerPreValueEditor.cs    |  23 ---
 .../JsonRadioButtonPickerPropertyEditor.cs    |  33 ----
 source/nuPickers/nuPickers.csproj             |  25 +--
 17 files changed, 249 insertions(+), 87 deletions(-)
 rename source/nuPickers/DataEditors/DotNetTypeaheadListPicker/{DotNetTypeaheadListPickerPropertyEditor.cs => DotNetTypeaheadPickerDataEditor.cs} (100%)
 rename source/nuPickers/DataEditors/EnumCheckBoxPicker/{EnumCheckBoxPickerPropertyEditor.cs => EnumCheckBoxPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/EnumDropDownPicker/{EnumDropDownPickerPropertyEditor.cs => EnumDropDownPickerDataEditor.cs} (93%)
 rename source/nuPickers/DataEditors/EnumLabels/{EnumLabelsPropertyEditor.cs => EnumLabelsDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/EnumPrefetchListPicker/{EnumPrefetchListPropertyEditor.cs => EnumPrefetchListPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/EnumRadioButtonPicker/{EnumRadioButtonPickerPropertyEditor.cs => EnumRadioButtonPickerDataEditor.cs} (94%)
 rename source/nuPickers/DataEditors/JsonCheckBoxPicker/{JsonCheckBoxPickerPropertyEditor.cs => JsonCheckBoxPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/JsonDropDownPicker/{JsonDropDownPickerPropertyEditor.cs => JsonDropDownPickerDataEditor.cs} (94%)
 rename source/nuPickers/DataEditors/JsonLabels/{JsonLabelsPropertyEditor.cs => JsonLabelsDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/JsonPagedListPicker/{JsonPagedListPickerPropertyEditor.cs => JsonPagedListPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/JsonPrefetchListPicker/{JsonPrefetchListPickerPropertyEditor.cs => JsonPrefetchListPickerDataEditor.cs} (95%)
 create mode 100644 source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
 create mode 100644 source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs

diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
similarity index 100%
rename from source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs
index cf9865c..55bfc5f 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs
@@ -36,12 +36,12 @@ namespace nuPickers.DataEditors.EnumCheckBoxPicker
         EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class EnumCheckBoxPickerPropertyEditor : DataEditor
+    public class EnumCheckBoxPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new EnumCheckBoxPickerConfigurationEditor();
 
-        public EnumCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        public EnumCheckBoxPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs
similarity index 93%
rename from source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs
index a21c5c9..82433fe 100644
--- a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs
@@ -21,11 +21,11 @@ namespace nuPickers.DataEditors.EnumDropDownPicker
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class EnumDropDownPickerPropertyEditor  : DataEditor
+    public class EnumDropDownPickerDataEditor  : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerConfigurationEditor();
 
-        public EnumDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        public EnumDropDownPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs
index 353f5ec..5ebde79 100644
--- a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs
@@ -33,11 +33,11 @@ namespace nuPickers.DataEditors.EnumLabels
         EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class EnumLabelsPropertyEditor : DataEditor
+    public class EnumLabelsDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
 
-        public EnumLabelsPropertyEditor(ILogger logger) : base(logger)
+        public EnumLabelsDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs
index 293c01d..fd54313 100644
--- a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs
@@ -38,13 +38,13 @@ namespace nuPickers.DataEditors.EnumPrefetchListPicker
         EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript,
         EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class EnumPrefetchListPropertyEditor : DataEditor
+    public class EnumPrefetchListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new EnumPrefetchListPickerConfigurationEditor();
 
 
-        public EnumPrefetchListPropertyEditor(ILogger logger) : base(logger)
+        public EnumPrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs
index 1ff9e0c..9e30490 100644
--- a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs
@@ -21,13 +21,13 @@ namespace nuPickers.DataEditors.EnumRadioButtonPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class EnumRadioButtonPickerPropertyEditor : DataEditor
+    public class EnumRadioButtonPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new EnumRadioButtonPickerConfigurationEditor();
 
 
-        public EnumRadioButtonPickerPropertyEditor(ILogger logger) : base(logger)
+        public EnumRadioButtonPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs
index cb0f143..783cf14 100644
--- a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs
@@ -23,11 +23,11 @@ namespace nuPickers.DataEditors.JsonCheckBoxPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class JsonCheckBoxPickerPropertyEditor : DataEditor
+    public class JsonCheckBoxPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new JsonCheckBoxPickerConfigurationEditor();
 
-        public JsonCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        public JsonCheckBoxPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs
index dc39cda..32bf1c7 100644
--- a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs
@@ -20,11 +20,11 @@ namespace nuPickers.DataEditors.JsonDropDownPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class JsonDropDownPickerPropertyEditor : DataEditor
+    public class JsonDropDownPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new JsonDropDownPickerConfigurationEditor();
 
-        public JsonDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        public JsonDropDownPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs
index 6604791..338d93d 100644
--- a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs
@@ -21,11 +21,11 @@ namespace nuPickers.DataEditors.JsonLabels
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class JsonLabelsPropertyEditor : DataEditor
+    public class JsonLabelsDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new JsonLabelsConfigurationEditor();
 
-        public JsonLabelsPropertyEditor(ILogger logger) : base(logger)
+        public JsonLabelsDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs
index 5b8b947..cb91c8e 100644
--- a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs
@@ -25,11 +25,11 @@ namespace nuPickers.DataEditors.JsonPagedListPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPagedListPickerPropertyEditor : DataEditor
+    public class JsonPagedListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new JsonPagedListPickerConfigurationEditor();
 
-        public JsonPagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        public JsonPagedListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs
index 24d9fca..0d5bdea 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs
@@ -24,13 +24,13 @@ namespace nuPickers.DataEditors.JsonPrefetchListPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPrefetchListPickerPropertyEditor : DataEditor
+    public class JsonPrefetchListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new JsonPrefetchListPickerConfigurationEditor();
 
 
-        public JsonPrefetchListPickerPropertyEditor(ILogger logger) : base(logger)
+        public JsonPrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..0e90d46
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs
@@ -0,0 +1,24 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    internal class JsonRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..838dcb3
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    internal class JsonRadioButtonPickerConfigurationEditor : ConfigurationEditor<JsonRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+            var relationMapping = configuration?.RelationMapping;
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonRadioButtonPickerConfiguration configuration)
+          {
+
+            var output = new JsonRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs
new file mode 100644
index 0000000..1859534
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonRadioButtonPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonRadioButtonPickerConfigurationEditor();
+
+
+        public JsonRadioButtonPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index fe70e92..0000000
--- a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonRadioButtonPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
deleted file mode 100644
index 06c954d..0000000
--- a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonRadioButtonPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonRadioButtonPickerPropertyEditor : DataEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonRadioButtonPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index a93afc0..9a3b1a9 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -319,7 +319,10 @@
     <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfigurationEditor.cs" />
     <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfiguration.cs" />
-    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
@@ -349,35 +352,35 @@
     <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
-    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerDataEditor.cs" />
     <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
-    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerDataEditor.cs" />
     <Compile Include="DataEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumLabels\EnumLabelsConfiguration.cs" />
-    <Compile Include="DataEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsDataEditor.cs" />
     <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfiguration.cs" />
-    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerDataEditor.cs" />
     <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfiguration.cs" />
-    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerDataEditor.cs" />
     <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
-    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerDataEditor.cs" />
     <Compile Include="DataEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonLabels\JsonLabelsConfiguration.cs" />
-    <Compile Include="DataEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsDataEditor.cs" />
     <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerDataEditor.cs" />
     <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
     <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />

From 097bacdd4845a6b64048a78af21ac9436fa560b7 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 12 Aug 2019 16:33:19 +0100
Subject: [PATCH 23/43] Json type a head data editor

---
 ...DotNetTypeaheadListPickerConfiguration.cs} |   2 +-
 ...TypeaheadListPickerConfigurationEditor.cs} |   8 +-
 .../DotNetTypeaheadPickerDataEditor.cs        |   2 +-
 .../JsonTypeaheadListPickerConfiguration.cs   |  36 ++++
 ...nTypeaheadListPickerConfigurationEditor.cs | 162 ++++++++++++++++++
 .../JsonTypeaheadListPickerPreValueEditor.cs  |  26 ---
 .../JsonTypeaheadPickerDataEditor.cs          |  38 ++++
 .../JsonTypeaheadPickerPropertyEditor.cs      |  36 ----
 source/nuPickers/nuPickers.csproj             |   7 +-
 9 files changed, 247 insertions(+), 70 deletions(-)
 rename source/nuPickers/DataEditors/DotNetTypeaheadListPicker/{DotNetTypeaheadListPickerPreConfiguration.cs => DotNetTypeaheadListPickerConfiguration.cs} (94%)
 rename source/nuPickers/DataEditors/DotNetTypeaheadListPicker/{DotNetTypeaheadListPickerPreConfigurationEditor.cs => DotNetTypeaheadListPickerConfigurationEditor.cs} (92%)
 create mode 100644 source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
 create mode 100644 source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs

diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
similarity index 94%
rename from source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs
rename to source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
index 090dcbe..b60dacc 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
@@ -2,7 +2,7 @@
 
 namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
 {
-    internal class DotNetTypeaheadListPickerPreConfiguration : ValueListConfiguration
+    internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
similarity index 92%
rename from source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs
rename to source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
index 118acb9..0c4a162 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
@@ -7,9 +7,9 @@
 
 namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
 {
-    internal class DotNetTypeaheadListPickerPreConfigurationEditor : ConfigurationEditor<DotNetTypeaheadListPickerPreConfiguration>
+    internal class DotNetTypeaheadListPickerConfigurationEditor : ConfigurationEditor<DotNetTypeaheadListPickerConfiguration>
     {
-        public override Dictionary<string, object> ToConfigurationEditor(DotNetTypeaheadListPickerPreConfiguration configuration)
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetTypeaheadListPickerConfiguration configuration)
         {
             var configuredItems = configuration?.Items; // ordered
             object editorItems;
@@ -90,9 +90,9 @@ private class ItemValue
             [JsonProperty("sortOrder")]
             public int SortOrder { get; set; }
         }
-          public override DotNetTypeaheadListPickerPreConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetTypeaheadListPickerPreConfiguration configuration)
+          public override DotNetTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetTypeaheadListPickerConfiguration configuration)
         {
-            var output = new DotNetTypeaheadListPickerPreConfiguration();
+            var output = new DotNetTypeaheadListPickerConfiguration();
 
             if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
                 return output; // oops
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
index 4269c50..54778ea 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
@@ -28,7 +28,7 @@ namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
     public class DotNetTypeaheadPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
-            new DotNetTypeaheadListPickerPreConfigurationEditor();
+            new DotNetTypeaheadListPickerConfigurationEditor();
 
 
         public DotNetTypeaheadPickerDataEditor(ILogger logger) : base(logger)
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
new file mode 100644
index 0000000..18b6708
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
@@ -0,0 +1,36 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    internal class JsonTypeaheadListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html",
+            HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..794830c
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,162 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    internal class JsonTypeaheadListPickerConfigurationEditor : ConfigurationEditor<JsonTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new JsonTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index 633b1c8..0000000
--- a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonTypeaheadListPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs
new file mode 100644
index 0000000..22de0c7
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs
@@ -0,0 +1,38 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonTypeaheadPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonTypeaheadListPickerConfigurationEditor();
+
+
+        public JsonTypeaheadPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
deleted file mode 100644
index d363245..0000000
--- a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonTypeaheadListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonTypeaheadPickerPropertyEditor : DataEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonTypeaheadListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 9a3b1a9..d9ca57a 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -317,12 +317,15 @@
     <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfiguration.cs" />
     <Compile Include="DataEditors\DotNetRadioButtonPicker\DotnetRadioButtonPickerDataEditor.cs" />
     <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfigurationEditor.cs" />
-    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfigurationEditor.cs" />
-    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerConfiguration.cs" />
     <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadPickerDataEditor.cs" />
     <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfiguration.cs" />
     <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From 62a7ef5ebc81577ced469d5242914cfac4c71aa1 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 09:24:06 +0100
Subject: [PATCH 24/43] Lucene Checkbox, refactor name of lucene, sql picker

---
 source/nuPickers.Tests/nuPickers.Tests.csproj |   3 +
 ...asePropertyEditor.cs => BaseDataEditor.cs} |   4 +-
 .../DotNetCheckBoxPickerConfiguration.cs      |  23 ++-
 .../LuceneCheckBoxPickerConfiguration.cs      |  36 ++++
 ...LuceneCheckBoxPickerConfigurationEditor.cs | 164 ++++++++++++++++++
 .../LuceneCheckBoxPickerDataEditor.cs         |  35 ++++
 .../LuceneCheckBoxPickerPreValueEditor.cs     |  26 ---
 .../LuceneCheckBoxPickerPropertyEditor.cs     |  34 ----
 ...r.cs => LuceneDropDownPickerDataEditor.cs} |   4 +-
 ...rtyEditor.cs => LuceneLabelsDataEditor.cs} |   4 +-
 ....cs => LucenePagedListPickerDataEditor.cs} |   4 +-
 ...itor.cs => SqlDropDownPickerDataEditor.cs} |   4 +-
 source/nuPickers/nuPickers.csproj             |  13 +-
 13 files changed, 271 insertions(+), 83 deletions(-)
 rename source/nuPickers/DataEditors/{BasePropertyEditor.cs => BaseDataEditor.cs} (62%)
 create mode 100644 source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
 create mode 100644 source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
 rename source/nuPickers/DataEditors/LuceneDropDownPicker/{LuceneDropDownPickerPropertyEditor.cs => LuceneDropDownPickerDataEditor.cs} (94%)
 rename source/nuPickers/DataEditors/LuceneLabels/{LuceneLabelsPropertyEditor.cs => LuceneLabelsDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/LucenePagedListPicker/{LucenePagedListPickerPropertyEditor.cs => LucenePagedListPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/SqlDropDownPicker/{SqlDropDownPickerPropertyEditor.cs => SqlDropDownPickerDataEditor.cs} (94%)

diff --git a/source/nuPickers.Tests/nuPickers.Tests.csproj b/source/nuPickers.Tests/nuPickers.Tests.csproj
index e460410..51756ea 100644
--- a/source/nuPickers.Tests/nuPickers.Tests.csproj
+++ b/source/nuPickers.Tests/nuPickers.Tests.csproj
@@ -69,6 +69,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DataSources" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/source/nuPickers/DataEditors/BasePropertyEditor.cs b/source/nuPickers/DataEditors/BaseDataEditor.cs
similarity index 62%
rename from source/nuPickers/DataEditors/BasePropertyEditor.cs
rename to source/nuPickers/DataEditors/BaseDataEditor.cs
index 8ab625b..308c09f 100644
--- a/source/nuPickers/DataEditors/BasePropertyEditor.cs
+++ b/source/nuPickers/DataEditors/BaseDataEditor.cs
@@ -5,12 +5,12 @@
 
 namespace nuPickers.DataEditors
 {
-    public abstract class BasePropertyEditor : DataEditor
+    public abstract class BaseDataEditor : DataEditor
     {
         protected override IDataValueEditor CreateValueEditor()  => new SaveFormatPropertyValueEditor(Attribute);
 
 
-        protected BasePropertyEditor(ILogger logger, EditorType type = EditorType.PropertyValue) : base(logger, type)
+        protected BaseDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
index dd5bcd8..25adb45 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -4,22 +4,29 @@ namespace nuPickers.DataEditors.DotNetCheckBoxPicker
 {
     internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
     {
-
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public object DataSource { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public object CheckBoxPicker { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..7fd4003
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
@@ -0,0 +1,36 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    internal class LuceneCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..559fe27
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,164 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetCheckBoxPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    internal class LuceneCheckBoxPickerConfigurationEditor : ConfigurationEditor<LuceneCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, LuceneCheckBoxPickerConfiguration configuration)
+        {
+            var output = new LuceneCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                output.SaveFormat = saveFormatObj;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs
new file mode 100644
index 0000000..8a00797
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneCheckBoxPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new LuceneCheckBoxPickerConfigurationEditor();
+
+        public LuceneCheckBoxPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 9991b9d..0000000
--- a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneCheckBoxPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index 579202d..0000000
--- a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneCheckBoxPickerPropertyEditor : DataEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LuceneCheckBoxPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs
index 2595a98..8625034 100644
--- a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs
@@ -20,11 +20,11 @@ namespace nuPickers.DataEditors.LuceneDropDownPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneDropDownPickerPropertyEditor : DataEditor
+    public class LuceneDropDownPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneDropDownPickerConfigurationEditor();
 
-        public LuceneDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        public LuceneDropDownPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs
index 1ae3232..c96e111 100644
--- a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs
@@ -21,11 +21,11 @@ namespace nuPickers.DataEditors.LuceneLabels
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneLabelsPropertyEditor : DataEditor
+    public class LuceneLabelsDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneLabelsConfigurationEditor();
 
-        public LuceneLabelsPropertyEditor(ILogger logger) : base(logger)
+        public LuceneLabelsDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs
index 67a86ae..428a422 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs
@@ -25,11 +25,11 @@ namespace nuPickers.DataEditors.LucenePagedListPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePagedListPickerPropertyEditor : DataEditor
+    public class LucenePagedListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePagedListPickerConfigurationEditor();
 
-        public LucenePagedListPickerPropertyEditor(ILogger logger) : base(logger)
+        public LucenePagedListPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs
index 67abfb9..8632090 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs
@@ -20,11 +20,11 @@ namespace nuPickers.DataEditors.SqlDropDownPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
-    public class SqlDropDownPickerPropertyEditor : DataEditor
+    public class SqlDropDownPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new SqlDropDownPickerConfigurationEditor();
 
-        public SqlDropDownPickerPropertyEditor(ILogger logger) : base(logger)
+        public SqlDropDownPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index d9ca57a..ca383fe 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -326,6 +326,9 @@
     <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfiguration.cs" />
     <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
@@ -338,7 +341,7 @@
     <Compile Include="Helper.cs" />
     <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DataEditors\BasePropertyEditor.cs" />
+    <Compile Include="DataEditors\BaseDataEditor.cs" />
     <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfiguration.cs" />
     <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerDataEditor.cs" />
     <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfigurationEditor.cs" />
@@ -386,13 +389,13 @@
     <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
-    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerDataEditor.cs" />
     <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
-    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsDataEditor.cs" />
     <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
-    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerDataEditor.cs" />
     <Compile Include="DataEditors\DataEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
@@ -402,7 +405,7 @@
     </Compile>
     <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfiguration.cs" />
-    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerDataEditor.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
     <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\DataSource\DataSource.cs" />

From 11527b3159fc7743a4fb85e570384683ab067dc6 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 09:34:22 +0100
Subject: [PATCH 25/43] Lucene Prefetch editor, replace PropertyEditorConstants
 with DataEditorConstants

---
 ...nTypeaheadListPickerConfigurationEditor.cs |   9 +-
 .../LucenePrefetchListPickerConfiguration.cs  |  37 ++++
 ...nePrefetchListPickerConfigurationEditor.cs | 167 ++++++++++++++++++
 ... => LucenePrefetchListPickerDataEditor.cs} |  18 +-
 .../LucenePrefetchListPickerPreValueEditor.cs |  26 ---
 .../LuceneRadioButtonPickerPropertyEditor.cs  |   2 +-
 .../LuceneTypeaheadPickerPropertyEditor.cs    |   2 +-
 ...rPropertyEditor.cs => PickerDataEditor.cs} |   2 +-
 .../RelationLabelsPropertyEditor.cs           |   2 +-
 .../SqlCheckBoxPickerPropertyEditor.cs        |   2 +-
 .../SqlLabels/SqlLabelsPropertyEditor.cs      |   2 +-
 .../SqlPagedListPickerPropertyEditor.cs       |   2 +-
 .../SqlPrefetchListPickerPropertyEditor.cs    |   2 +-
 .../SqlRadioButtonPickerPropertyEditor.cs     |   2 +-
 .../SqlTypeaheadListPickerPropertyEditor.cs   |   2 +-
 .../XmlCheckBoxPickerPropertyEditor.cs        |   2 +-
 .../XmlDropDownPickerPropertyEditor.cs        |   2 +-
 .../XmlLabels/XmlLabelsPropertyEditor.cs      |   2 +-
 .../XmlPagedListPickerPropertyEditor.cs       |   2 +-
 .../XmlPrefetchListPickerPropertyEditor.cs    |   2 +-
 .../XmlRadioButtonPickerPropertyEditor.cs     |   2 +-
 .../XmlTypeaheadListPickerPropertyEditor.cs   |   2 +-
 .../nuPickers/Shared/DataSource/DataSource.cs |  12 +-
 source/nuPickers/nuPickers.csproj             |   3 +
 24 files changed, 248 insertions(+), 58 deletions(-)
 create mode 100644 source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/LucenePrefetchListPicker/{LucenePrefetchListPickerPropertyEditor.cs => LucenePrefetchListPickerDataEditor.cs} (77%)
 delete mode 100644 source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
 rename source/nuPickers/DataEditors/{PickerPropertyEditor.cs => PickerDataEditor.cs} (95%)

diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
index 794830c..688099e 100644
--- a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
@@ -31,7 +31,7 @@ public override Dictionary<string, object> ToConfigurationEditor(JsonTypeaheadLi
             var dataSource = configuration?.DataSource;
             var saveFormat = configuration?.SaveFormat;
             var customLabel = configuration?.CustomLabel;
-
+            var relationMapping = configuration?.RelationMapping;
             var listPicker = configuration?.ListPicker;
             var useLabel = configuration?.UseLabel ?? false;
             var typeaheadListPicker = configuration?.TypeaheadListPicker;
@@ -47,6 +47,8 @@ public override Dictionary<string, object> ToConfigurationEditor(JsonTypeaheadLi
                 { "listPicker", listPicker },
                 {"typeaheadListPicker",typeaheadListPicker},
 
+                {"relationMapping",relationMapping}
+
             };
         }
         private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
@@ -128,7 +130,10 @@ public override JsonTypeaheadListPickerConfiguration FromConfigurationEditor(IDi
                 if (convertString.Success)
                     output.ListPicker = convertString.Result;
             }
-
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
             // auto-assigning our ids, get next id from existing values
             var nextId = 1;
             if (configuration?.Items != null && configuration.Items.Count > 0)
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..ab531e3
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -0,0 +1,37 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
+{
+    internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Custom Label",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel =
+                true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..5e83300
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
+{
+    internal class LucenePrefetchListPickerConfigurationEditor : ConfigurationEditor<LucenePrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LucenePrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LucenePrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LucenePrefetchListPickerConfiguration configuration)
+        {
+            var output = new LucenePrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
similarity index 77%
rename from source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
index cf619f7..16ed502 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
@@ -1,13 +1,16 @@
-namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
+using nuPickers.DataEditors;
+using nuPickers.DataEditors.LucenePrefetchListPicker;
+using Umbraco.Core.Logging;
+
+namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePrefetchListPickerPropertyEditor : DataEditor
+    public class LucenePrefetchListPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePrefetchListPickerConfigurationEditor();
+
+        public LucenePrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new LucenePrefetchListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index aaacedd..0000000
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LucenePrefetchListPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
index 5d0b3f5..885936e 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
index 5621d73..83a8a33 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [DataEditor(PropertyEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/PickerPropertyEditor.cs b/source/nuPickers/DataEditors/PickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/PickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/PickerDataEditor.cs
index be12f63..13b2972 100644
--- a/source/nuPickers/DataEditors/PickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/PickerDataEditor.cs
@@ -17,7 +17,7 @@ namespace nuComponents.DataTypes.PropertyEditors
 
     // CONFIG
     [PropertyEditorAsset(ClientDependencyType.Javascript, "App_Plugins/nuComponents/DataTypes/Shared/RelationTypeMapping/RelationMappingConfigController.js")]
-    public abstract class PickerPropertyEditor : DataEditor
+    public abstract class PickerDataEditor : DataEditor
     {
         protected PickerPropertyEditor(ILogger logger) : base(logger)
         {
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
index 130deb6..7e6b32c 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
index f480e3b..69e5a7a 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
index f5b808c..ac3ea47 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
index 1ec4eef..af49024 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
index bc9f8a6..52a3882 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
index 82ebf29..605b820 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
index 30368b6..1515566 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
index 7fa26b4..95353f9 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
index bc98363..19e0feb 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
index 078409b..ba77c38 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
index 3e64db8..cad78f4 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
index 274e354..ab72099 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
index b4f9479..48be397 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
index b356567..da45712 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditor(DataEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 7a54f9d..f51e4dd 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -52,12 +52,12 @@ internal static IDataSource GetDataSource(string propertyEditorAlias, string dat
                 case DataEditorConstants.SqlTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<SqlDataSource.SqlDataSource>(dataSourceConfig);
 
-              /*  case PropertyEditorConstants.XmlCheckBoxPickerAlias:
-                case PropertyEditorConstants.XmlDropDownPickerAlias:
-                case PropertyEditorConstants.XmlLabelsAlias:
-                case PropertyEditorConstants.XmlPrefetchListPickerAlias:
-                case PropertyEditorConstants.XmlRadioButtonPickerAlias:
-                case PropertyEditorConstants.XmlTypeaheadListPickerAlias:
+              /*  case DataEditorConstants.XmlCheckBoxPickerAlias:
+                case DataEditorConstants.XmlDropDownPickerAlias:
+                case DataEditorConstants.XmlLabelsAlias:
+                case DataEditorConstants.XmlPrefetchListPickerAlias:
+                case DataEditorConstants.XmlRadioButtonPickerAlias:
+                case DataEditorConstants.XmlTypeaheadListPickerAlias:
                     return JsonConvert.DeserializeObject<XmlDataSource.XmlDataSource>(dataSourceConfig);*/
             }
 
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index ca383fe..402a255 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -329,6 +329,9 @@
     <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfiguration.cs" />
     <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From 9e2f7c7a30113b03c85b54f849de6751f2c2cb50 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 09:40:14 +0100
Subject: [PATCH 26/43] adjust namespace in not included editors yet

---
 .../LucenePrefetchListPickerDataEditor.cs     | 40 +++++++++----------
 .../LuceneRadioButtonPickerPreValueEditor.cs  |  2 +-
 .../LuceneRadioButtonPickerPropertyEditor.cs  |  2 +-
 ...LuceneTypeaheadListPickerPreValueEditor.cs |  2 +-
 .../LuceneTypeaheadPickerPropertyEditor.cs    |  2 +-
 .../RelationLabelsPreValueEditor.cs           |  2 +-
 .../RelationLabelsPropertyEditor.cs           |  2 +-
 .../SqlCheckBoxPickerPreValueEditor.cs        |  2 +-
 .../SqlCheckBoxPickerPropertyEditor.cs        |  2 +-
 .../SqlLabels/SqlLabelsPreValueEditor.cs      |  2 +-
 .../SqlLabels/SqlLabelsPropertyEditor.cs      |  2 +-
 .../SqlPagedListPickerPreValueEditor.cs       |  2 +-
 .../SqlPagedListPickerPropertyEditor.cs       |  2 +-
 .../SqlPrefetchListPickerPreValueEditor.cs    |  2 +-
 .../SqlPrefetchListPickerPropertyEditor.cs    |  2 +-
 .../SqlRadioButtonPickerPreValueEditor.cs     |  2 +-
 .../SqlRadioButtonPickerPropertyEditor.cs     |  2 +-
 .../SqlTypeaheadListPickerPreValueEditor.cs   |  2 +-
 .../SqlTypeaheadListPickerPropertyEditor.cs   |  2 +-
 .../XmlCheckBoxPickerPreValueEditor.cs        |  2 +-
 .../XmlCheckBoxPickerPropertyEditor.cs        |  2 +-
 .../XmlDropDownPickerPreValueEditor.cs        |  2 +-
 .../XmlDropDownPickerPropertyEditor.cs        |  2 +-
 .../XmlLabels/XmlLabelsPreValueEditor.cs      |  2 +-
 .../XmlLabels/XmlLabelsPropertyEditor.cs      |  2 +-
 .../XmlPagedListPickerPreValueEditor.cs       |  2 +-
 .../XmlPagedListPickerPropertyEditor.cs       |  2 +-
 .../XmlPrefetchListPickerPreValueEditor.cs    |  2 +-
 .../XmlPrefetchListPickerPropertyEditor.cs    |  2 +-
 .../XmlRadioButtonPickerPreValueEditor.cs     |  2 +-
 .../XmlRadioButtonPickerPropertyEditor.cs     |  2 +-
 .../XmlTypeaheadListPickerPreValueEditor.cs   |  2 +-
 .../XmlTypeaheadListPickerPropertyEditor.cs   |  2 +-
 33 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
index 16ed502..cad478a 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
@@ -1,33 +1,29 @@
-using nuPickers.DataEditors;
-using nuPickers.DataEditors.LucenePrefetchListPicker;
+using ClientDependency.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
 
-namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
 {
-    using ClientDependency.Core;
-    using EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
     // EDITOR UI
-    [DataEditor(DataEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [DataEditor(DataEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
 
     // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
     public class LucenePrefetchListPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePrefetchListPickerConfigurationEditor();
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
index 8871634..0923a0f 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.LuceneRadioButtonPicker
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
index 885936e..3f09d72 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.LuceneRadioButtonPicker
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
index 98d40a1..a333f9a 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.LuceneTypeaheadListPicker
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
index 83a8a33..6d6f067 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.LuceneTypeaheadListPicker
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
index 630ee84..c65d570 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.RelationLabels
+namespace nuPickers.DataEditors.RelationLabels
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
index 7e6b32c..051a553 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.RelationLabels
+namespace nuPickers.DataEditors.RelationLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
index 499ed07..9e8a776 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlCheckBoxPicker
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
index 69e5a7a..51ca840 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlCheckBoxPicker
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
index 514dd1b..6edf140 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlLabels
+namespace nuPickers.DataEditors.SqlLabels
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
index ac3ea47..ed14a50 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlLabels
+namespace nuPickers.DataEditors.SqlLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
index 0dbb0ff..c7e1d42 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlPagedListPicker
+namespace nuPickers.DataEditors.SqlPagedListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
index af49024..8d98c2c 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlPagedListPicker
+namespace nuPickers.DataEditors.SqlPagedListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
index 7c955f1..a91ca59 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlPrefetchListPicker
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
index 52a3882..04e1b68 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlPrefetchListPicker
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
index 88988e8..a072077 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlRadioButtonPicker
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
index 605b820..fd6300a 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlRadioButtonPicker
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
index edca708..a28b19c 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlTypeaheadListPicker
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
index 1515566..c9dceea 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.SqlTypeaheadListPicker
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
index b121f62..b2bddc2 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlCheckBoxPicker
+namespace nuPickers.DataEditors.XmlCheckBoxPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
index 95353f9..05f9ff0 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlCheckBoxPicker
+namespace nuPickers.DataEditors.XmlCheckBoxPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
index f02965c..e8b5373 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlDropDownPicker
+namespace nuPickers.DataEditors.XmlDropDownPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
index 19e0feb..31c46a6 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlDropDownPicker
+namespace nuPickers.DataEditors.XmlDropDownPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
index 3a9a5f3..ac55c96 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlLabels
+namespace nuPickers.DataEditors.XmlLabels
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
index ba77c38..aa8071b 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlLabels
+namespace nuPickers.DataEditors.XmlLabels
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
index aa15650..f8470e8 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlPagedListPicker
+namespace nuPickers.DataEditors.XmlPagedListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
index cad78f4..746d6ee 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlPagedListPicker
+namespace nuPickers.DataEditors.XmlPagedListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
index 553bd93..b0281c2 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlPrefetchListPicker
+namespace nuPickers.DataEditors.XmlPrefetchListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
index ab72099..5a50bf8 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlPrefetchListPicker
+namespace nuPickers.DataEditors.XmlPrefetchListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
index e840829..da7a881 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlRadioButtonPicker
+namespace nuPickers.DataEditors.XmlRadioButtonPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
index 48be397..b918501 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlRadioButtonPicker
+namespace nuPickers.DataEditors.XmlRadioButtonPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
index b9bb447..c82631e 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlTypeaheadListPicker
+namespace nuPickers.DataEditors.XmlTypeaheadListPicker
 {
     using nuPickers.EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
index da45712..6546bf2 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
@@ -1,4 +1,4 @@
-namespace nuPickers.PropertyEditors.XmlTypeaheadListPicker
+namespace nuPickers.DataEditors.XmlTypeaheadListPicker
 {
     using ClientDependency.Core;
     using nuPickers.EmbeddedResource;

From 649d81cde523e7cd7c5be6d46cc6d2dc2fdde7a1 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 09:53:21 +0100
Subject: [PATCH 27/43] Mass replace PropertyEditor with dataeditor, migrate
 LuceneRadioButton

---
 .../EmbeddedResourceHelperTests.cs            |   2 +-
 .../LucenePrefetchListPickerConfiguration.cs  |   2 +-
 .../LuceneRadioButtonPickerConfiguration.cs   |  31 ++++
 ...eneRadioButtonPickerConfigurationEditor.cs | 154 ++++++++++++++++++
 .../LuceneRadioButtonPickerPreValueEditor.cs  |  23 ---
 .../LuceneRadioButtonPickerPropertyEditor.cs  |  13 +-
 ...LuceneTypeaheadListPickerPreValueEditor.cs |   2 +-
 .../LuceneTypeaheadPickerPropertyEditor.cs    |   4 +-
 .../nuPickers/DataEditors/PickerDataEditor.cs |   2 +-
 .../RelationLabelsPreValueEditor.cs           |   2 +-
 .../RelationLabelsPropertyEditor.cs           |   8 +-
 .../SqlCheckBoxPickerPreValueEditor.cs        |   2 +-
 .../SqlCheckBoxPickerPropertyEditor.cs        |   8 +-
 .../SqlLabels/SqlLabelsPreValueEditor.cs      |   2 +-
 .../SqlLabels/SqlLabelsPropertyEditor.cs      |   8 +-
 .../SqlPagedListPickerPreValueEditor.cs       |   2 +-
 .../SqlPagedListPickerPropertyEditor.cs       |   8 +-
 .../SqlPrefetchListPickerPreValueEditor.cs    |   2 +-
 .../SqlPrefetchListPickerPropertyEditor.cs    |   8 +-
 .../SqlRadioButtonPickerPreValueEditor.cs     |   2 +-
 .../SqlRadioButtonPickerPropertyEditor.cs     |   8 +-
 .../SqlTypeaheadListPickerPreValueEditor.cs   |   2 +-
 .../SqlTypeaheadListPickerPropertyEditor.cs   |   8 +-
 .../XmlCheckBoxPickerPreValueEditor.cs        |   2 +-
 .../XmlCheckBoxPickerPropertyEditor.cs        |   8 +-
 .../XmlDropDownPickerPreValueEditor.cs        |   2 +-
 .../XmlDropDownPickerPropertyEditor.cs        |   8 +-
 .../XmlLabels/XmlLabelsPreValueEditor.cs      |   2 +-
 .../XmlLabels/XmlLabelsPropertyEditor.cs      |   8 +-
 .../XmlPagedListPickerPreValueEditor.cs       |   2 +-
 .../XmlPagedListPickerPropertyEditor.cs       |   8 +-
 .../XmlPrefetchListPickerPreValueEditor.cs    |   2 +-
 .../XmlPrefetchListPickerPropertyEditor.cs    |   8 +-
 .../XmlRadioButtonPickerPreValueEditor.cs     |   2 +-
 .../XmlRadioButtonPickerPropertyEditor.cs     |   8 +-
 .../XmlTypeaheadListPickerPreValueEditor.cs   |   2 +-
 .../XmlTypeaheadListPickerPropertyEditor.cs   |   8 +-
 .../nuPickers/PickerPropertyValueConverter.cs |   2 +-
 .../nuPickers/Shared/DataSource/DataSource.cs |   2 +-
 source/nuPickers/nuPickers.csproj             |   3 +
 40 files changed, 274 insertions(+), 106 deletions(-)
 create mode 100644 source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs

diff --git a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
index d6a20d9..1e4426a 100644
--- a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
+++ b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
@@ -1,7 +1,7 @@
 namespace nuPickers.Tests.EmbeddedResource
 {
     using NUnit.Framework;
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     public class HelperEmbeddedResourceHelperTests
     {
         // reference to known embedded resources (picked first folder in shared)
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
index ab531e3..93665d7 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -16,7 +16,7 @@ internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
-        [ConfigurationField("prefetchListPicker", "",
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel =
                 true)]
         public object PrefetchListPicker { get; set; }
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..111c332
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
@@ -0,0 +1,31 @@
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LuceneRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public object SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..727cc8f
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,154 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.EnumRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
+{
+    internal class LuceneRadioButtonPickerConfigurationEditor : ConfigurationEditor<LuceneRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+                { "dataSource", dataSource },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LuceneRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LuceneRadioButtonPickerConfiguration configuration)
+        {
+            var output = new LuceneRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 0923a0f..0000000
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.DataEditors.LuceneRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneRadioButtonPickerPreValueEditor : ValueListConfiguration
-    {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
index 3f09d72..e959ea9 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
@@ -1,8 +1,10 @@
-namespace nuPickers.DataEditors.LuceneRadioButtonPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
@@ -25,9 +27,10 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class LuceneRadioButtonPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneRadioButtonPickerConfigurationEditor();
+
+        public LuceneRadioButtonPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new LuceneRadioButtonPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
index a333f9a..48a3c78 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class LuceneTypeaheadListPickerPreValueEditor : ValueListConfiguration
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
index 6d6f067..a8ebcbd 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
@@ -1,8 +1,8 @@
 namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
diff --git a/source/nuPickers/DataEditors/PickerDataEditor.cs b/source/nuPickers/DataEditors/PickerDataEditor.cs
index 13b2972..43487aa 100644
--- a/source/nuPickers/DataEditors/PickerDataEditor.cs
+++ b/source/nuPickers/DataEditors/PickerDataEditor.cs
@@ -19,7 +19,7 @@ namespace nuComponents.DataTypes.PropertyEditors
     [PropertyEditorAsset(ClientDependencyType.Javascript, "App_Plugins/nuComponents/DataTypes/Shared/RelationTypeMapping/RelationMappingConfigController.js")]
     public abstract class PickerDataEditor : DataEditor
     {
-        protected PickerPropertyEditor(ILogger logger) : base(logger)
+        protected PickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
index c65d570..ac6843b 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.RelationLabels
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class RelationLabelsPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
index 051a553..76f716a 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.RelationLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -21,7 +21,7 @@
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class RelationLabelsPropertyEditor : BasePropertyEditor
+    public class RelationLabelsPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
index 9e8a776..f46a8dc 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlCheckBoxPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
index 51ca840..84cdf44 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,7 +24,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class SqlCheckBoxPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
index 6edf140..0536559 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlLabels
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlLabelsPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
index ed14a50..4536d0f 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,7 +22,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlLabelsPropertyEditor : BasePropertyEditor
+    public class SqlLabelsPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
index c7e1d42..bfb81ed 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlPagedListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlPagedListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
index 8d98c2c..ede2a7d 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlPagedListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPagedListPickerPropertyEditor : BasePropertyEditor
+    public class SqlPagedListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
index a91ca59..67c5f49 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlPrefetchListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
index 04e1b68..5ee63f3 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,7 +25,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class SqlPrefetchListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
index a072077..248d388 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlRadioButtonPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
index fd6300a..f2c2ebc 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,7 +23,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class SqlRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
index a28b19c..ff4e3e4 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class SqlTypeaheadListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
index c9dceea..92932dc 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlTypeaheadListPickerPropertyEditor : BasePropertyEditor
+    public class SqlTypeaheadListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
index b2bddc2..8f07035 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlCheckBoxPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlCheckBoxPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
index 05f9ff0..3b7de23 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlCheckBoxPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,7 +24,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class XmlCheckBoxPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
index e8b5373..2af03e3 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlDropDownPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlDropDownPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
index 31c46a6..55908e0 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlDropDownPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,7 +21,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlDropDownPickerPropertyEditor : BasePropertyEditor
+    public class XmlDropDownPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
index ac55c96..d82a27e 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlLabels
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlLabelsPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
index aa8071b..782d944 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,7 +22,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlLabelsPropertyEditor : BasePropertyEditor
+    public class XmlLabelsPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
index f8470e8..d92ba37 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlPagedListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlPagedListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
index 746d6ee..9f40aac 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlPagedListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlPagedListPickerPropertyEditor : BasePropertyEditor
+    public class XmlPagedListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
index b0281c2..3fbe8a0 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlPrefetchListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlPrefetchListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
index 5a50bf8..9f2ec99 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,7 +25,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class XmlPrefetchListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
index da7a881..af2ec90 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlRadioButtonPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlRadioButtonPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
index b918501..5e36fc6 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,7 +23,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class XmlRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
index c82631e..74911ec 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -1,6 +1,6 @@
 namespace nuPickers.DataEditors.XmlTypeaheadListPicker
 {
-    using nuPickers.EmbeddedResource;
+    using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
     internal class XmlTypeaheadListPickerPreValueEditor : PreValueEditor
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
index 6546bf2..d46814e 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
 namespace nuPickers.DataEditors.XmlTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(DataEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlTypeaheadPickerPropertyEditor : BasePropertyEditor
+    public class XmlTypeaheadPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index b8bdcbf..72795c4 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Web;
-using nuPickers.DataEditors;
+using DataEditors;
 using Umbraco.Web.Composing;
 
 namespace nuPickers
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index f51e4dd..b199777 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using nuPickers.DataEditors;
+using DataEditors;
 
 namespace nuPickers.Shared.DataSource
 {
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 402a255..9ccf5ab 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -332,6 +332,9 @@
     <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfiguration.cs" />
     <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From 24c31092f2f94fb5171b1a2f2d63d51a5ebbd97a Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 10:27:51 +0100
Subject: [PATCH 28/43] Replace PreValueField, prevalueeditor with
 configuration, migrate Relation Label

---
 ...LuceneTypeaheadListPickerConfiguration.cs} |  18 +-
 ...eTypeaheadListPickerConfigurationEditor.cs | 167 ++++++++++++++++++
 ....cs => LuceneTypeaheadPickerDataEditor.cs} |  15 +-
 .../RelationLabelsConfiguration.cs            |  19 ++
 .../RelationLabelsConfigurationEditor.cs      | 148 ++++++++++++++++
 .../RelationLabelsPreValueEditor.cs           |  17 --
 .../RelationLabelsPropertyEditor.cs           |  11 +-
 .../SqlCheckBoxPickerPreValueEditor.cs        |  14 +-
 .../SqlLabels/SqlLabelsPreValueEditor.cs      |   8 +-
 .../SqlPagedListPickerPreValueEditor.cs       |  14 +-
 .../SqlPrefetchListPickerPreValueEditor.cs    |  14 +-
 .../SqlRadioButtonPickerPreValueEditor.cs     |  12 +-
 .../SqlTypeaheadListPickerPreValueEditor.cs   |  14 +-
 .../XmlCheckBoxPickerPreValueEditor.cs        |  14 +-
 .../XmlDropDownPickerPreValueEditor.cs        |   8 +-
 .../XmlLabels/XmlLabelsPreValueEditor.cs      |  10 +-
 .../XmlPagedListPickerPreValueEditor.cs       |  14 +-
 .../XmlPrefetchListPickerPreValueEditor.cs    |  14 +-
 .../XmlRadioButtonPickerPreValueEditor.cs     |  12 +-
 .../XmlTypeaheadListPickerPreValueEditor.cs   |  14 +-
 source/nuPickers/nuPickers.csproj             |   6 +
 21 files changed, 450 insertions(+), 113 deletions(-)
 rename source/nuPickers/DataEditors/LuceneTypeaheadPicker/{LuceneTypeaheadListPickerPreValueEditor.cs => LuceneTypeaheadListPickerConfiguration.cs} (55%)
 create mode 100644 source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/LuceneTypeaheadPicker/{LuceneTypeaheadPickerPropertyEditor.cs => LuceneTypeaheadPickerDataEditor.cs} (88%)
 create mode 100644 source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
 create mode 100644 source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs
 delete mode 100644 source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs

diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
similarity index 55%
rename from source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
index 48a3c78..1f78130 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
@@ -3,24 +3,26 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class LuceneTypeaheadListPickerPreValueEditor : ValueListConfiguration
+    internal class LuceneTypeaheadListPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
-        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
+        [ConfigurationField("typeaheadListPicker", "Type ahead list Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
 
         [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
+        public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..93f008e
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
+{
+    internal class LuceneTypeaheadListPickerConfigurationEditor : ConfigurationEditor<LuceneTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LuceneTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LuceneTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new LuceneTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
similarity index 88%
rename from source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
index a8ebcbd..a6863e0 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -26,11 +28,16 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneTypeaheadPickerPropertyEditor : DataEditor
+    public class LuceneTypeaheadPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new LuceneTypeaheadListPickerConfigurationEditor();
+
+
+        public LuceneTypeaheadPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new LuceneTypeaheadListPickerPreValueEditor();
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
new file mode 100644
index 0000000..0c8f7c9
--- /dev/null
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
@@ -0,0 +1,19 @@
+namespace nuPickers.DataEditors.RelationLabels
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class RelationLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..555a39b
--- /dev/null
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.RelationLabels
+{
+    internal class RelationLabelsConfigurationEditor : ConfigurationEditor<RelationLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(RelationLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override RelationLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, RelationLabelsConfiguration configuration)
+        {
+            var output = new RelationLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
deleted file mode 100644
index ac6843b..0000000
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.DataEditors.RelationLabels
-{
-    using EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class RelationLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
index 76f716a..4c1f363 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.RelationLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.RelationLabels
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -23,9 +25,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class RelationLabelsPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new RelationLabelsConfigurationEditor();
+
+
+        public RelationLabelsPropertyEditor(ILogger logger) : base(logger)
         {
-            return new RelationLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
index f46a8dc..29e0fb3 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlCheckBoxPickerPreValueEditor : PreValueEditor
+    internal class SqlCheckBoxPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
index 0536559..5701895 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
@@ -3,15 +3,15 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlLabelsPreValueEditor : PreValueEditor
+    internal class SqlLabelsPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
index bfb81ed..7e3f16e 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlPagedListPickerPreValueEditor : PreValueEditor
+    internal class SqlPagedListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public string PagedListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
index 67c5f49..f222763 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlPrefetchListPickerPreValueEditor : PreValueEditor
+    internal class SqlPrefetchListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
index 248d388..b865ff3 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
@@ -3,21 +3,21 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlRadioButtonPickerPreValueEditor : PreValueEditor
+    internal class SqlRadioButtonPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
index ff4e3e4..8777e8c 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlTypeaheadListPickerPreValueEditor : PreValueEditor
+    internal class SqlTypeaheadListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
index 8f07035..dde0c06 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlCheckBoxPickerPreValueEditor : PreValueEditor
+    internal class XmlCheckBoxPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
index 2af03e3..5cc42a2 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
@@ -3,15 +3,15 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlDropDownPickerPreValueEditor : PreValueEditor
+    internal class XmlDropDownPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
index d82a27e..febe6ad 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -3,21 +3,21 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlLabelsPreValueEditor : PreValueEditor
+    internal class XmlLabelsPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        [ConfigurationField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
         public string Labels { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
index d92ba37..49bed69 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlPagedListPickerPreValueEditor : PreValueEditor
+    internal class XmlPagedListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public string PagedListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
index 3fbe8a0..47fe3fb 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlPrefetchListPickerPreValueEditor : PreValueEditor
+    internal class XmlPrefetchListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
index af2ec90..5c5378c 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
@@ -3,21 +3,21 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlRadioButtonPickerPreValueEditor : PreValueEditor
+    internal class XmlRadioButtonPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
index 74911ec..8e7a04f 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -3,24 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class XmlTypeaheadListPickerPreValueEditor : PreValueEditor
+    internal class XmlTypeaheadListPickerPreValueEditor ValueListConfiguration
     {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 9ccf5ab..e9f3c92 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -335,6 +335,12 @@
     <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfiguration.cs" />
     <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From abecc82fd5729692144e95902ea6ce2e43f45f7e Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 10:39:17 +0100
Subject: [PATCH 29/43] Mass add name of Fields, unification of names

---
 .../DotNetCheckBoxPickerConfiguration.cs                  | 2 +-
 .../DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs | 2 +-
 .../DotNetPagedListPickerConfiguration.cs                 | 2 +-
 .../DotNetPrefetchListPickerConfiguration.cs              | 2 +-
 .../DotNetTypeaheadListPickerConfiguration.cs             | 4 ++--
 .../EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs | 2 +-
 .../DataEditors/EnumLabels/EnumLabelsConfiguration.cs     | 2 +-
 .../EnumPrefetchListPickerConfiguration.cs                | 2 +-
 .../DataEditors/JsonLabels/JsonLabelsConfiguration.cs     | 2 +-
 .../JsonPagedListPickerConfiguration.cs                   | 2 +-
 .../JsonPrefetchListPickerConfiguration.cs                | 2 +-
 .../DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs | 2 +-
 .../LucenePagedListPickerConfiguration.cs                 | 2 +-
 .../LucenePrefetchListPickerConfiguration.cs              | 2 +-
 .../RelationLabels/RelationLabelsConfiguration.cs         | 4 ++--
 .../SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs  | 6 +++---
 .../SqlDropDownPicker/SqlDropDownPickerConfiguration.cs   | 4 ++--
 .../SqlDropDownPickerConfigurationEditor.cs               | 8 +++++++-
 .../DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs      | 4 ++--
 .../SqlPagedListPickerPreValueEditor.cs                   | 6 +++---
 .../SqlPrefetchListPickerPreValueEditor.cs                | 6 +++---
 .../SqlRadioButtonPickerPreValueEditor.cs                 | 4 ++--
 .../SqlTypeaheadListPickerPreValueEditor.cs               | 4 ++--
 .../XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs  | 6 +++---
 .../XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs  | 4 ++--
 .../DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs      | 4 ++--
 .../XmlPagedListPickerPreValueEditor.cs                   | 6 +++---
 .../XmlPrefetchListPickerPreValueEditor.cs                | 6 +++---
 .../XmlRadioButtonPickerPreValueEditor.cs                 | 4 ++--
 .../XmlTypeaheadListPickerPreValueEditor.cs               | 4 ++--
 30 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
index 25adb45..fe59f77 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -13,7 +13,7 @@ internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
         public object DataSource { get; set; }
 
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
index bced04e..dab8189 100644
--- a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
@@ -8,7 +8,7 @@ internal class DotNetLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
index e25bbed..48727c0 100644
--- a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
@@ -9,7 +9,7 @@ internal class DotNetPagedListPickerConfiguration : ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
index 1c175a7..201561a 100644
--- a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
@@ -12,7 +12,7 @@ internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
index b60dacc..8f71520 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
@@ -6,7 +6,7 @@ internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
-        [ConfigurationField("dataSource", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
@@ -18,7 +18,7 @@ internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public object ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
index 4f2e4ba..1b6f080 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -9,7 +9,7 @@ internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
index af5b037..6778f4c 100644
--- a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -8,7 +8,7 @@ internal class EnumLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
index b481721..48ec65c 100644
--- a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
index 72c8458..f9f2250 100644
--- a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
             HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
index 13338d4..527299c 100644
--- a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonPagedListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
index bc4a04f..aaa1cf8 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
index f5dd2b2..802a1f5 100644
--- a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
@@ -7,7 +7,7 @@ internal class LuceneLabelsConfiguration : ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         /// <summary>
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
index 9e0a86a..94aa42a 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class LucenePagedListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
index 93665d7..9e19557 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -12,7 +12,7 @@ internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
                 true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "Custom Label",
+        [ConfigurationField("dataSource", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
index 0c8f7c9..a28ee3e 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
@@ -7,10 +7,10 @@ internal class RelationLabelsConfiguration : ValueListConfiguration
     {
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
index 29e0fb3..082959c 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
@@ -5,19 +5,19 @@
 
     internal class SqlCheckBoxPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
index c1b03cc..2e69c71 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -4,7 +4,7 @@ namespace nuPickers.DataEditors.SqlDropDownPicker
 {
     internal class SqlDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
 
@@ -12,7 +12,7 @@ internal class SqlDropDownPickerConfiguration : ValueListConfiguration
         public bool UseLabel { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
index 0d704c4..3c0d9cc 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
@@ -30,13 +30,15 @@ public override Dictionary<string, object> ToConfigurationEditor(SqlDropDownPick
             var dataSource = configuration?.DataSource;
             var saveFormat = configuration?.SaveFormat;
             var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
 
             return new Dictionary<string, object>
             {
                 { "items", editorItems },
                 { "useLabel", useLabel },
                 { "dataSource", dataSource },
-                { "saveFormat", saveFormat }
+                { "saveFormat", saveFormat },
+                {"relationMapping",relationMapping}
 
             };
         }
@@ -108,6 +110,10 @@ public override SqlDropDownPickerConfiguration FromConfigurationEditor(IDictiona
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
             // auto-assigning our ids, get next id from existing values
             var nextId = 1;
             if (configuration?.Items != null && configuration.Items.Count > 0)
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
index 5701895..603d903 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class SqlLabelsPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
index 7e3f16e..53d2a65 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class SqlPagedListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class SqlPagedListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
index f222763..f344deb 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class SqlPrefetchListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class SqlPrefetchListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
index b865ff3..a4248c2 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
@@ -5,7 +5,7 @@
 
     internal class SqlRadioButtonPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
@@ -14,7 +14,7 @@ internal class SqlRadioButtonPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
index 8777e8c..261b302 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
@@ -5,7 +5,7 @@
 
     internal class SqlTypeaheadListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class SqlTypeaheadListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
index dde0c06..201a903 100644
--- a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
@@ -5,19 +5,19 @@
 
     internal class XmlCheckBoxPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public string CheckBoxPicker { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
index 5cc42a2..c779e2a 100644
--- a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class XmlDropDownPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
index febe6ad..2a3dd91 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class XmlLabelsPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
index 49bed69..fe79d2d 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class XmlPagedListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class XmlPagedListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
index 47fe3fb..4fd69fc 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -5,10 +5,10 @@
 
     internal class XmlPrefetchListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class XmlPrefetchListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
index 5c5378c..990159a 100644
--- a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
@@ -5,7 +5,7 @@
 
     internal class XmlRadioButtonPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
@@ -14,7 +14,7 @@ internal class XmlRadioButtonPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
index 8e7a04f..1b2923e 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -5,7 +5,7 @@
 
     internal class XmlTypeaheadListPickerPreValueEditor ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
@@ -17,7 +17,7 @@ internal class XmlTypeaheadListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
-        [ConfigurationField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public string RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]

From 58dca5f5950ae5e6f9c93d58cc8840d81000e0ea Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 11:22:38 +0100
Subject: [PATCH 30/43] Correct earlier Mass replacement

---
 .../EmbeddedResourceHelperTests.cs            | 45 ++++++++++---------
 .../DotNetCheckBoxPickerConfiguration.cs      |  2 +-
 .../DotNetLabels/DotNetLabelsConfiguration.cs |  2 +-
 .../DotNetPagedListPickerConfiguration.cs     |  2 +-
 .../DotNetPrefetchListPickerConfiguration.cs  |  2 +-
 .../DotNetTypeaheadListPickerConfiguration.cs |  4 +-
 .../EnumCheckBoxPickerConfiguration.cs        | 20 ++++++---
 .../EnumLabels/EnumLabelsConfiguration.cs     |  2 +-
 .../EnumPrefetchListPickerConfiguration.cs    |  2 +-
 .../JsonLabels/JsonLabelsConfiguration.cs     |  2 +-
 .../JsonPagedListPickerConfiguration.cs       |  2 +-
 .../JsonPrefetchListPickerConfiguration.cs    |  2 +-
 .../LuceneLabels/LuceneLabelsConfiguration.cs |  2 +-
 .../LucenePagedListPickerConfiguration.cs     |  2 +-
 .../LucenePrefetchListPickerConfiguration.cs  |  2 +-
 .../RelationLabelsConfiguration.cs            |  2 +-
 .../SqlLabels/SqlLabelsPreValueEditor.cs      |  2 +-
 .../SqlPagedListPickerPreValueEditor.cs       |  6 +--
 .../SqlPrefetchListPickerPreValueEditor.cs    |  6 +--
 .../SqlTypeaheadListPickerPreValueEditor.cs   |  4 +-
 .../XmlLabels/XmlLabelsPreValueEditor.cs      |  4 +-
 .../XmlPagedListPickerPreValueEditor.cs       |  6 +--
 .../XmlPrefetchListPickerPreValueEditor.cs    |  6 +--
 .../XmlTypeaheadListPickerPreValueEditor.cs   |  4 +-
 .../nuPickers/PickerPropertyValueConverter.cs |  4 +-
 .../nuPickers/Shared/DataSource/DataSource.cs |  2 +-
 .../XmlDataSource/XmlDataSourceConfig.html    |  2 -
 source/nuPickers/nuPickers.csproj             | 12 +++++
 28 files changed, 84 insertions(+), 69 deletions(-)

diff --git a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
index 1e4426a..8af6f3d 100644
--- a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
+++ b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
@@ -1,13 +1,14 @@
-namespace nuPickers.Tests.EmbeddedResource
+using nuPickers.EmbeddedResource;
+
+namespace nuPickers.Tests.EmbeddedResource
 {
     using NUnit.Framework;
-    using EmbeddedResource;
     public class HelperEmbeddedResourceHelperTests
     {
         // reference to known embedded resources (picked first folder in shared)
-        private const string HTML_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.html";
-        private const string CSS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.css";
-        private const string JS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditorController.js";
+        private const string HtmlResource = "CheckBoxPicker.CheckBoxPickerEditor.html";
+        private const string CssResource = "CheckBoxPicker.CheckBoxPickerEditor.css";
+        private const string JsResource = "CheckBoxPicker.CheckBoxPickerEditorController.js";
 
         [Test]
         public void ResourceNamesThatDoNotExist()
@@ -15,16 +16,16 @@ public void ResourceNamesThatDoNotExist()
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(null));
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
         [Test]
         public void ResourceNamesThatExist()
         {
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
         [Test]
@@ -33,32 +34,32 @@ public void GetResourcesThatDoNotExist()
             Assert.IsNull(EmbeddedResourceHelper.GetResource(null));
             Assert.IsNull(EmbeddedResourceHelper.GetResource(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
         [Test]
         public void GetResourcesThatExist()
         {
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
         [Test]
         public void GetResourceNameFromValidPath()
         {
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX,
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX,
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext"));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext"));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
         [Test]
@@ -69,7 +70,7 @@ public void GetResourceNameFromInvalidPath()
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("/folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext"));
-            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
index fe59f77..bad51c8 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -13,7 +13,7 @@ internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
         public object DataSource { get; set; }
 
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
index dab8189..a063da8 100644
--- a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
@@ -8,7 +8,7 @@ internal class DotNetLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
index 48727c0..4902830 100644
--- a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
@@ -9,7 +9,7 @@ internal class DotNetPagedListPickerConfiguration : ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
index 201561a..07b1200 100644
--- a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
@@ -12,7 +12,7 @@ internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
index 8f71520..27de6c4 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
@@ -12,10 +12,10 @@ internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
-        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public object TypeaheadListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
index 1b6f080..d9a84f2 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -4,21 +4,27 @@ namespace nuPickers.DataEditors.EnumCheckBoxPicker
 {
     internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public object DataSource { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
 
-        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
         public object CheckBoxPicker { get; set; }
 
-        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
         public string LayoutDirection { get; set; }
 
-        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
         public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
index 6778f4c..5e9f2a7 100644
--- a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -8,7 +8,7 @@ internal class EnumLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
index 48ec65c..d4c1ea6 100644
--- a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
index f9f2250..0dda6d3 100644
--- a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonLabelsConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
             HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
index 527299c..cf814c7 100644
--- a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonPagedListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
index aaa1cf8..8867439 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
index 802a1f5..68b3def 100644
--- a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
@@ -7,7 +7,7 @@ internal class LuceneLabelsConfiguration : ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
         /// <summary>
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
index 94aa42a..11a9846 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class LucenePagedListPickerConfiguration : ValueListConfiguration
             EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
index 9e19557..3015ad4 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -12,7 +12,7 @@ internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
                 true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro",
+        [ConfigurationField("customLabel", "Label Macro",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public object CustomLabel { get; set; }
 
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
index a28ee3e..173b11f 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
@@ -10,7 +10,7 @@ internal class RelationLabelsConfiguration : ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
         public object DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
index 603d903..36e8f37 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
@@ -8,7 +8,7 @@ internal class SqlLabelsPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
index 53d2a65..1bdeedc 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
@@ -8,13 +8,13 @@ internal class SqlPagedListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "Paged List Picker, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public string PagedListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
index f344deb..ebb4ec4 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
@@ -8,13 +8,13 @@ internal class SqlPrefetchListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
index 261b302..4736502 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
@@ -11,10 +11,10 @@ internal class SqlTypeaheadListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
index 2a3dd91..a83d884 100644
--- a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -8,13 +8,13 @@ internal class XmlLabelsPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
         /// <summary>
         /// currently no ui, but forces controller to be loaded
         /// </summary>
-        [ConfigurationField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
         public string Labels { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
index fe79d2d..91edbf8 100644
--- a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -8,13 +8,13 @@ internal class XmlPagedListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("pagedListPicker", "Paged List Picker, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
         public string PagedListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
index 4fd69fc..093ff61 100644
--- a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -8,13 +8,13 @@ internal class XmlPrefetchListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
         public string DataSource { get; set; }
 
-        [ConfigurationField("dataSource", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
         public string PrefetchListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
index 1b2923e..99f68b0 100644
--- a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -11,10 +11,10 @@ internal class XmlTypeaheadListPickerPreValueEditor ValueListConfiguration
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
         public string CustomLabel { get; set; }
 
-        [ConfigurationField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
         public string TypeaheadListPicker { get; set; }
 
-        [ConfigurationField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
         public string ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index 72795c4..e8aec0c 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Web;
-using DataEditors;
+using nuPickers.DataEditors;
 using Umbraco.Web.Composing;
 
 namespace nuPickers
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index b199777..f51e4dd 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using DataEditors;
+using nuPickers.DataEditors;
 
 namespace nuPickers.Shared.DataSource
 {
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html b/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
index cdd021c..af90848 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
@@ -10,8 +10,6 @@
             <select ng-model="model.value.xmlData"
                     ng-init="model.value.xmlData = model.value.xmlData || 'content'">
                 <option value="content">Content</option>
-                <option value="media">Media</option>
-                <option value="members">Members</option>
                 <option value="url">URL</option>
             </select>
         </div>
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index e9f3c92..80ee9f6 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -341,6 +341,18 @@
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfiguration.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPropertyEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From bf3c6b0fe3cdc270f692f8401443060b13fd0461 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 11:33:29 +0100
Subject: [PATCH 31/43] Migrate sqlcheckboxpicker

---
 ...r.cs => SqlCheckBoxPickerConfiguration.cs} |  16 +-
 .../SqlCheckBoxPickerConfigurationEditor.cs   | 164 ++++++++++++++++++
 .../SqlCheckBoxPickerPropertyEditor.cs        |  10 +-
 source/nuPickers/nuPickers.csproj             |   3 +-
 4 files changed, 182 insertions(+), 11 deletions(-)
 rename source/nuPickers/DataEditors/SqlCheckBoxPicker/{SqlCheckBoxPickerPreValueEditor.cs => SqlCheckBoxPickerConfiguration.cs} (66%)
 create mode 100644 source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs

diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
similarity index 66%
rename from source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
index 082959c..5209673 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
@@ -3,24 +3,26 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlCheckBoxPickerPreValueEditor ValueListConfiguration
+    internal class SqlCheckBoxPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
         [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
+        public object CheckBoxPicker { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
+        public object LayoutDirection { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..e27552e
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,164 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneCheckBoxPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
+{
+    internal class SqlCheckBoxPickerConfigurationEditor : ConfigurationEditor<SqlCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override SqlCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, SqlCheckBoxPickerConfiguration configuration)
+        {
+            var output = new SqlCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                output.SaveFormat = saveFormatObj;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
index 84cdf44..e24ffbc 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlCheckBoxPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -26,9 +28,11 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     public class SqlCheckBoxPickerPropertyEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new SqlCheckBoxPickerConfigurationEditor();
+
+        public SqlCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
         {
-            return new SqlCheckBoxPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 80ee9f6..e4089d8 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -341,7 +341,8 @@
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfiguration.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
-    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPreValueEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfiguration.cs" />
     <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPropertyEditor.cs" />
     <Compile Include="DataEditors\SqlLabels\SqlLabelsPreValueEditor.cs" />
     <Compile Include="DataEditors\SqlLabels\SqlLabelsPropertyEditor.cs" />

From a3e5310a380468d1d5cd9e3ae502b6849d22933d Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 11:44:41 +0100
Subject: [PATCH 32/43] migrate sql labels

---
 ...s => LuceneRadioButtonPickerDataEditor.cs} |   4 +-
 ...yEditor.cs => RelationLabelsDataEditor.cs} |   4 +-
 ...itor.cs => SqlCheckBoxPickerDataEditor.cs} |   4 +-
 .../SqlDropDownPickerConfiguration.cs         |   7 +-
 ...lueEditor.cs => SqlLabelsConfiguration.cs} |  11 +-
 .../SqlLabels/SqlLabelsConfigurationEditor.cs | 151 ++++++++++++++++++
 ...opertyEditor.cs => SqlLabelsDateEditor.cs} |  11 +-
 source/nuPickers/nuPickers.csproj             |  11 +-
 8 files changed, 180 insertions(+), 23 deletions(-)
 rename source/nuPickers/DataEditors/LuceneRadioButtonPicker/{LuceneRadioButtonPickerPropertyEditor.cs => LuceneRadioButtonPickerDataEditor.cs} (94%)
 rename source/nuPickers/DataEditors/RelationLabels/{RelationLabelsPropertyEditor.cs => RelationLabelsDataEditor.cs} (94%)
 rename source/nuPickers/DataEditors/SqlCheckBoxPicker/{SqlCheckBoxPickerPropertyEditor.cs => SqlCheckBoxPickerDataEditor.cs} (95%)
 rename source/nuPickers/DataEditors/SqlLabels/{SqlLabelsPreValueEditor.cs => SqlLabelsConfiguration.cs} (61%)
 create mode 100644 source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs
 rename source/nuPickers/DataEditors/SqlLabels/{SqlLabelsPropertyEditor.cs => SqlLabelsDateEditor.cs} (87%)

diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
index e959ea9..b78d20a 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
@@ -25,11 +25,11 @@ namespace nuPickers.DataEditors.LuceneRadioButtonPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneRadioButtonPickerPropertyEditor : DataEditor
+    public class LuceneRadioButtonPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneRadioButtonPickerConfigurationEditor();
 
-        public LuceneRadioButtonPickerPropertyEditor(ILogger logger) : base(logger)
+        public LuceneRadioButtonPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
similarity index 94%
rename from source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
index 4c1f363..939a205 100644
--- a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
@@ -23,13 +23,13 @@ namespace nuPickers.DataEditors.RelationLabels
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class RelationLabelsPropertyEditor : DataEditor
+    public class RelationLabelsDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new RelationLabelsConfigurationEditor();
 
 
-        public RelationLabelsPropertyEditor(ILogger logger) : base(logger)
+        public RelationLabelsDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
similarity index 95%
rename from source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
index e24ffbc..d0fc6c9 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
@@ -26,12 +26,12 @@ namespace nuPickers.DataEditors.SqlCheckBoxPicker
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlCheckBoxPickerPropertyEditor : DataEditor
+    public class SqlCheckBoxPickerDataEditor : DataEditor
     {
         protected override IConfigurationEditor CreateConfigurationEditor() =>
             new SqlCheckBoxPickerConfigurationEditor();
 
-        public SqlCheckBoxPickerPropertyEditor(ILogger logger) : base(logger)
+        public SqlCheckBoxPickerDataEditor(ILogger logger) : base(logger)
         {
         }
     }
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
index 2e69c71..3830657 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -4,13 +4,12 @@ namespace nuPickers.DataEditors.SqlDropDownPicker
 {
     internal class SqlDropDownPickerConfiguration : ValueListConfiguration
     {
-        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public object DataSource { get; set; }
-
-
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
 
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
         public object RelationMapping { get; set; }
 
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs
similarity index 61%
rename from source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs
index 36e8f37..6c0ba24 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs
@@ -3,15 +3,18 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlLabelsPreValueEditor ValueListConfiguration
+    internal class SqlLabelsConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
+        public object LayoutDirection { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..42d715b
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs
@@ -0,0 +1,151 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlLabels
+{
+    internal class SqlLabelsConfigurationEditor : ConfigurationEditor<SqlLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var customLabel = configuration?.CustomLabel;
+
+
+            var dataSource = configuration?.DataSource;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                {"layoutDirection",layoutDirection},
+                {"customLabel",customLabel}
+
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override SqlLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            SqlLabelsConfiguration configuration)
+        {
+            var output = new SqlLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+
+                    output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customLabelObj))
+            {
+
+                    output.CustomLabel = customLabelObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
similarity index 87%
rename from source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
index 4536d0f..e2b59fe 100644
--- a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlLabels
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -22,11 +24,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlLabelsPropertyEditor : DataEditor
+    public class SqlLabelsDateEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlLabelsConfigurationEditor();
+
+        public SqlLabelsDateEditor(ILogger logger) : base(logger)
         {
-            return new SqlLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index e4089d8..47fc486 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -334,18 +334,19 @@
     <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerDataEditor.cs" />
     <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfiguration.cs" />
-    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerDataEditor.cs" />
     <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfiguration.cs" />
     <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerDataEditor.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\RelationLabels\RelationLabelsConfiguration.cs" />
-    <Compile Include="DataEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsDataEditor.cs" />
     <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfigurationEditor.cs" />
     <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfiguration.cs" />
-    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="DataEditors\SqlLabels\SqlLabelsPreValueEditor.cs" />
-    <Compile Include="DataEditors\SqlLabels\SqlLabelsPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsDateEditor.cs" />
     <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPreValueEditor.cs" />
     <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPropertyEditor.cs" />
     <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPreValueEditor.cs" />

From fa6a884f38f6bc8024c73b03409f3ec38fb87ba3 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 11:58:24 +0100
Subject: [PATCH 33/43] migrate last sql pickers

---
 ....cs => SqlPagedListPickerConfiguration.cs} |  19 +-
 .../SqlPagedListPickerConfigurationEditor.cs  | 170 ++++++++++++++++++
 ...r.cs => SqlPagedListPickerEditorEditor.cs} |  11 +-
 ... => SqlPrefetchListPickerConfiguration.cs} |  17 +-
 ...qlPrefetchListPickerConfigurationEditor.cs | 168 +++++++++++++++++
 ....cs => SqlPrefetchListPickerDataEditor.cs} |  11 +-
 ...s => SqlRadioButtonPickerConfiguration.cs} |  15 +-
 ...SqlRadioButtonPickerConfigurationEditor.cs | 154 ++++++++++++++++
 ...r.cs => SqlRadioButtonPickerDataEditor.cs} |  11 +-
 ...=> SqlTypeaheadListPickerConfiguration.cs} |  17 +-
 ...lTypeaheadListPickerConfigurationEditor.cs | 167 +++++++++++++++++
 ...cs => SqlTypeaheadListPickerDataEditor.cs} |  11 +-
 source/nuPickers/nuPickers.csproj             |  20 ++-
 13 files changed, 739 insertions(+), 52 deletions(-)
 rename source/nuPickers/DataEditors/SqlPagedListPicker/{SqlPagedListPickerPreValueEditor.cs => SqlPagedListPickerConfiguration.cs} (60%)
 create mode 100644 source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/SqlPagedListPicker/{SqlPagedListPickerPropertyEditor.cs => SqlPagedListPickerEditorEditor.cs} (88%)
 rename source/nuPickers/DataEditors/SqlPrefetchListPicker/{SqlPrefetchListPickerPreValueEditor.cs => SqlPrefetchListPickerConfiguration.cs} (67%)
 create mode 100644 source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/SqlPrefetchListPicker/{SqlPrefetchListPickerPropertyEditor.cs => SqlPrefetchListPickerDataEditor.cs} (88%)
 rename source/nuPickers/DataEditors/SqlRadioButtonPicker/{SqlRadioButtonPickerPreValueEditor.cs => SqlRadioButtonPickerConfiguration.cs} (65%)
 create mode 100644 source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/SqlRadioButtonPicker/{SqlRadioButtonPickerPropertyEditor.cs => SqlRadioButtonPickerDataEditor.cs} (86%)
 rename source/nuPickers/DataEditors/SqlTypeaheadListPicker/{SqlTypeaheadListPickerPreValueEditor.cs => SqlTypeaheadListPickerConfiguration.cs} (67%)
 create mode 100644 source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
 rename source/nuPickers/DataEditors/SqlTypeaheadListPicker/{SqlTypeaheadListPickerPropertyEditor.cs => SqlTypeaheadListPickerDataEditor.cs} (88%)

diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
similarity index 60%
rename from source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
index 1bdeedc..79b82d6 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
@@ -3,24 +3,27 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlPagedListPickerPreValueEditor ValueListConfiguration
+    internal class SqlPagedListPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
-        [ConfigurationField("pagedListPicker", "Paged List Picker, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
+        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
 
         [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
+        public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..bc0e3c0
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,170 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlPagedListPicker
+{
+    internal class SqlPagedListPickerConfigurationEditor : ConfigurationEditor<SqlPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlPagedListPickerConfiguration configuration)
+        {
+            var output = new SqlPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
similarity index 88%
rename from source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
index ede2a7d..b469483 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlPagedListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlPagedListPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -26,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPagedListPickerPropertyEditor : DataEditor
+    public class SqlPagedListPickerEditorEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlPagedListPickerConfigurationEditor();
+
+        public SqlPagedListPickerEditorEditor(ILogger logger) : base(logger)
         {
-            return new SqlPagedListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
similarity index 67%
rename from source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
index ebb4ec4..cbdf2b3 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
@@ -3,24 +3,27 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlPrefetchListPickerPreValueEditor ValueListConfiguration
+    internal class SqlPrefetchListPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
         [ConfigurationField("prefetchListPicker", "Prefetch List Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
+        public object PrefetchListPicker { get; set; }
 
         [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
+        public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..13c18c2
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,168 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LucenePrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
+{
+    internal class SqlPrefetchListPickerConfigurationEditor : ConfigurationEditor<SqlPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlPrefetchListPickerConfiguration configuration)
+        {
+            var output = new SqlPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
similarity index 88%
rename from source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
index 5ee63f3..a7f8ae2 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlPrefetchListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -25,11 +27,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPrefetchListPickerPropertyEditor : DataEditor
+    public class SqlPrefetchListPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlPrefetchListPickerConfigurationEditor();
+
+        public SqlPrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlPrefetchListPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
similarity index 65%
rename from source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
index a4248c2..191c9cb 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
@@ -3,21 +3,24 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlRadioButtonPickerPreValueEditor ValueListConfiguration
+    internal class SqlRadioButtonPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
         [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
+        public object LayoutDirection { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..54ce2c6
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,154 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
+{
+    internal class SqlRadioButtonPickerConfigurationEditor : ConfigurationEditor<SqlRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+                { "dataSource", dataSource },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlRadioButtonPickerConfiguration configuration)
+        {
+            var output = new SqlRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
similarity index 86%
rename from source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
index f2c2ebc..345ac31 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlRadioButtonPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -23,11 +25,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlRadioButtonPickerPropertyEditor : DataEditor
+    public class SqlRadioButtonPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlRadioButtonPickerConfigurationEditor();
+
+        public SqlRadioButtonPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlRadioButtonPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
similarity index 67%
rename from source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
rename to source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
index 4736502..4d72740 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
@@ -3,24 +3,27 @@
     using EmbeddedResource;
     using Umbraco.Core.PropertyEditors;
 
-    internal class SqlTypeaheadListPickerPreValueEditor ValueListConfiguration
+    internal class SqlTypeaheadListPickerConfiguration : ValueListConfiguration
     {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
         [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
+        public object DataSource { get; set; }
 
         [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
+        public object CustomLabel { get; set; }
 
         [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
+        public object TypeaheadListPicker { get; set; }
 
         [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
+        public object ListPicker { get; set; }
 
         [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
+        public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
+        public object SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..984736e
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
+{
+    internal class SqlTypeaheadListPickerConfigurationEditor : ConfigurationEditor<SqlTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new SqlTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
similarity index 88%
rename from source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
index 92932dc..db52446 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.DataEditors.SqlTypeaheadListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
     using ClientDependency.Core;
     using EmbeddedResource;
@@ -26,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlTypeaheadListPickerPropertyEditor : DataEditor
+    public class SqlTypeaheadListPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlTypeaheadListPickerConfigurationEditor();
+
+        public SqlTypeaheadListPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlTypeaheadListPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 47fc486..2f5bbee 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -347,14 +347,18 @@
     <Compile Include="DataEditors\SqlLabels\SqlLabelsConfigurationEditor.cs" />
     <Compile Include="DataEditors\SqlLabels\SqlLabelsConfiguration.cs" />
     <Compile Include="DataEditors\SqlLabels\SqlLabelsDateEditor.cs" />
-    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPreValueEditor.cs" />
-    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerPropertyEditor.cs" />
-    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerEditorEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />

From 757b1db0dd5b5e5a0e1653f075a9fffd408d0f77 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Wed, 14 Aug 2019 08:44:42 +0100
Subject: [PATCH 34/43] Use correct Configuration

---
 .../DotNetLabels/DotNetLabelsConfigurationEditor.cs       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
index 8544fc6..8c4f530 100644
--- a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
@@ -8,9 +8,9 @@
 
 namespace nuPickers.DataEditors.DotNetLabels
 {
-    internal class DotNetLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
+    internal class DotNetLabelsConfigurationEditor : ConfigurationEditor<DotNetLabelsConfiguration>
     {
-        public override Dictionary<string, object> ToConfigurationEditor(EnumLabelsConfiguration configuration)
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetLabelsConfiguration configuration)
         {
             var configuredItems = configuration?.Items; // ordered
             object editorItems;
@@ -85,9 +85,9 @@ private class ItemValue
             [JsonProperty("sortOrder")]
             public int SortOrder { get; set; }
         }
-          public override EnumLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumLabelsConfiguration configuration)
+          public override DotNetLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetLabelsConfiguration configuration)
         {
-            var output = new EnumLabelsConfiguration();
+            var output = new DotNetLabelsConfiguration();
 
             if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
                 return output; // oops

From 27ed7c93e9c09ec7f673bd375833ad830b707eb5 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Wed, 14 Aug 2019 08:49:47 +0100
Subject: [PATCH 35/43] Restore original building script

---
 build-appveyor.cmd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-appveyor.cmd b/build-appveyor.cmd
index d16eefc..ee7b222 100644
--- a/build-appveyor.cmd
+++ b/build-appveyor.cmd
@@ -31,8 +31,8 @@ SET VSWherePath="%InstallDir%\MSBuild"
 ECHO.
 ECHO Visual Studio is installed in: %InstallDir%
 
-//CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
-CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
+CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
+//CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err

From 218212a98982944ab85a6ff820a69958daafbcf0 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Wed, 14 Aug 2019 08:54:27 +0100
Subject: [PATCH 36/43] remove idea rider files

---
 source/.idea/.idea.nuPickers/.idea/.name         |  1 -
 .../.idea/.idea.nuPickers/.idea/indexLayout.xml  |  8 --------
 source/.idea/.idea.nuPickers/.idea/modules.xml   |  8 --------
 source/.idea/.idea.nuPickers/.idea/vcs.xml       |  6 ------
 source/.idea/.idea.nuPickers/riderModule.iml     | 16 ----------------
 5 files changed, 39 deletions(-)
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/.name
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/indexLayout.xml
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/modules.xml
 delete mode 100644 source/.idea/.idea.nuPickers/.idea/vcs.xml
 delete mode 100644 source/.idea/.idea.nuPickers/riderModule.iml

diff --git a/source/.idea/.idea.nuPickers/.idea/.name b/source/.idea/.idea.nuPickers/.idea/.name
deleted file mode 100644
index aaf1b6e..0000000
--- a/source/.idea/.idea.nuPickers/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-nuPickers
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/indexLayout.xml b/source/.idea/.idea.nuPickers/.idea/indexLayout.xml
deleted file mode 100644
index 27ba142..0000000
--- a/source/.idea/.idea.nuPickers/.idea/indexLayout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ContentModelUserStore">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/modules.xml b/source/.idea/.idea.nuPickers/.idea/modules.xml
deleted file mode 100644
index da6e6cd..0000000
--- a/source/.idea/.idea.nuPickers/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.nuPickers/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.nuPickers/riderModule.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/.idea/vcs.xml b/source/.idea/.idea.nuPickers/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/source/.idea/.idea.nuPickers/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/source/.idea/.idea.nuPickers/riderModule.iml b/source/.idea/.idea.nuPickers/riderModule.iml
deleted file mode 100644
index c4eb8e4..0000000
--- a/source/.idea/.idea.nuPickers/riderModule.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RIDER_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../../../appveyor.yml" />
-    <content url="file://$MODULE_DIR$/../../../build-appveyor.cmd" />
-    <content url="file://$MODULE_DIR$/../../../build.cmd" />
-    <content url="file://$MODULE_DIR$/../../../build/appveyor-semver.ps1" />
-    <content url="file://$MODULE_DIR$/../../../build/check-release-version.ps1" />
-    <content url="file://$MODULE_DIR$/../../../build/icon.png" />
-    <content url="file://$MODULE_DIR$/../../../build/nuPickers.proj" />
-    <content url="file://$MODULE_DIR$/../../../build/package.nuspec" />
-    <content url="file://$MODULE_DIR$/../../../build/package.xml" />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From 92625633212293623c50de766f3a766bbbcef947 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Wed, 14 Aug 2019 11:39:10 +0100
Subject: [PATCH 37/43] use owner IPublishedContent instead of assign content

---
 source/nuPickers/PickerPropertyValueConverter.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index e8aec0c..d0fca68 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -86,18 +86,9 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
         {
             int contextId = -1;
             int parentId = -1;
-            IPublishedContent assignedContentItem;
 
-            try
-            {
-                assignedContentItem = Current.UmbracoHelper.AssignedContentItem;
-            }
-            catch
-            {
-                assignedContentItem = null;
-            }
 
-            if (assignedContentItem != null)
+            if (owner is IPublishedContent assignedContentItem)
             {
                 contextId = assignedContentItem.Id;
 

From 04cf3dac68dc1eeb30e2037915d1eaa5f1b6b957 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Thu, 15 Aug 2019 11:14:51 +0100
Subject: [PATCH 38/43] Fix for empty prevalues

---
 .../Components/RelationMappingComponent.cs    |   2 +-
 source/nuPickers/Picker.cs                    |  25 ++--
 .../nuPickers/PickerPropertyValueConverter.cs | 126 +++++++++++-------
 3 files changed, 87 insertions(+), 66 deletions(-)

diff --git a/source/nuPickers/Components/RelationMappingComponent.cs b/source/nuPickers/Components/RelationMappingComponent.cs
index 213be1e..0febbb8 100644
--- a/source/nuPickers/Components/RelationMappingComponent.cs
+++ b/source/nuPickers/Components/RelationMappingComponent.cs
@@ -82,7 +82,7 @@ private void Saved(IService sender, IEnumerable<IContentBase> savedEntities)
 
                     if (!string.IsNullOrWhiteSpace(picker.RelationTypeAlias))
                     {
-                        bool isRelationsOnly = picker.GetDataTypePreValue("saveFormat").ToString() == "relationsOnly";
+                        bool isRelationsOnly = picker.GetEditorDataItems().GetType().GetProperty("saveFormat").ToString() == "relationsOnly";
 
                         if (isRelationsOnly)
                         {
diff --git a/source/nuPickers/Picker.cs b/source/nuPickers/Picker.cs
index b9dca5c..2f82ec2 100644
--- a/source/nuPickers/Picker.cs
+++ b/source/nuPickers/Picker.cs
@@ -130,7 +130,7 @@ public IEnumerable<string> PickedKeys
             {
                 if (this.pickedKeys == null)
                 {
-                    if (this.GetDataTypePreValue("saveFormat").ToString() == "relationsOnly")
+                    if (this.DataTypePreValues.GetType().GetProperty("saveFormat")?.ToString() == "relationsOnly")
                     {
                         // attempt to find relations data in memory cache
                         this.pickedKeys = Cache.Instance.GetSet(CacheConstants.PickedKeysPrefix + this.ContextId.ToString() + "_" + this.PropertyAlias, () =>
@@ -179,7 +179,7 @@ internal string RelationTypeAlias
             get
             {
                 // not all pickers support relation mapping, so null check required
-                object relationMappingPreValue = this.GetDataTypePreValue("relationMapping");
+                object relationMappingPreValue = this.GetType().GetProperty("relationMapping");
                 if (relationMappingPreValue != null && !string.IsNullOrWhiteSpace(relationMappingPreValue.ToString()))
                 {
                     // parse the json config to get a relationType alias
@@ -219,13 +219,13 @@ internal string RelationTypeAlias
         /// <summary>
         /// Property accessor to ensure the query to populate the data-type configruation options is only done once per server
         /// </summary>
-        private IDictionary<string, object> DataTypePreValues
+        private object DataTypePreValues
         {
             get
             {
                 return Cache.Instance.GetSet(CacheConstants.DataTypePreValuesPrefix + DataTypeId, () =>
                     {
-                        return Current.Services.DataTypeService.GetDataType(DataTypeId).Editor.DefaultConfiguration;
+                        return Current.Services.DataTypeService.GetDataType(DataTypeId).Configuration;
                     });
             }
         }
@@ -238,7 +238,7 @@ private IDictionary<string, object> DataTypePreValues
         /// Get all the prevalues for this picker
         /// </summary>
         /// <returns>collection of all <see cref="PreValue"/> for this datatype</returns>
-        public IDictionary<string, object> GetDataTypePreValues()
+        public object GetDataTypePreValues()
         {
             return this.DataTypePreValues;
         }
@@ -248,10 +248,7 @@ public IDictionary<string, object> GetDataTypePreValues()
         /// </summary>
         /// <param name="key"></param>
         /// <returns>the <see cref="PreValue"/> if found, or null</returns>
-        public object GetDataTypePreValue(string key)
-        {
-            return this.DataTypePreValues.SingleOrDefault(x => string.Equals(x.Key, key, StringComparison.InvariantCultureIgnoreCase)).Value;
-        }
+
 
         /// <summary>
         /// Get a collection of all (key/label) items for this picker
@@ -266,8 +263,8 @@ public IEnumerable<EditorDataItem> GetEditorDataItems(string typeahead = null)
                             this.ContextId,
                             this.ParentId,
                             this.PropertyAlias,
-                            DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").ToString()),
-                            this.GetDataTypePreValue("customLabel").ToString(),
+                            DataSource.GetDataSource(this.PropertyEditorAlias, DataTypePreValues.GetType().GetProperty("dataSource").ToString()),
+                            DataTypePreValues.GetType().GetProperty("customLabel").ToString(),
                             typeahead);
         }
 
@@ -286,8 +283,8 @@ public IEnumerable<EditorDataItem> GetPickedEditorDataItems()
                                     this.ContextId,
                                     this.ParentId,
                                     this.PropertyAlias,
-                                    DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").ToString()),
-                                    this.GetDataTypePreValue("customLabel").ToString(),
+                                    DataSource.GetDataSource(this.PropertyEditorAlias, DataTypePreValues.GetType().GetProperty("dataSource").ToString()),
+                                    DataTypePreValues.GetType().GetProperty("customLabel").ToString(),
                                     this.PickedKeys.ToArray());
             }
 
@@ -353,7 +350,7 @@ public IEnumerable<T> AsEnums<T>() where T : struct, IConvertible
         public IEnumerable<Enum> AsEnums()
         {
             List<Enum> enums = new List<Enum>();
-            Object dataSourceJson = this.GetDataTypePreValue("dataSource");
+            Object dataSourceJson = this.GetType().GetProperty("dataSource");
 
             if (dataSourceJson != null)
             {
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index d0fca68..4efbfe2 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,4 +1,6 @@
-using nuPickers.DataEditors;
+using System;
+using nuPickers.DataEditors;
+using Umbraco.Core;
 using Umbraco.Web.Composing;
 
 namespace nuPickers
@@ -25,6 +27,11 @@ public override bool IsConverter(IPublishedPropertyType propertyType)
             return IsPicker(propertyType.EditorAlias);
         }
 
+        public override bool? IsValue(object value, PropertyValueLevel level)
+        {
+            // otherwise use the old magic null & string comparisons
+            return value != null && (!(value is string) || string.IsNullOrWhiteSpace((string) value) == false);
+        }
 
 
         /// <summary>
@@ -34,45 +41,59 @@ public override bool IsConverter(IPublishedPropertyType propertyType)
         /// <returns></returns>
         public static bool IsPicker(string propertyEditorAlias)
         {
-            return new string[] {
-                        DataEditorConstants.DotNetCheckBoxPickerAlias,
-                        DataEditorConstants.DotNetDropDownPickerAlias,
-                        DataEditorConstants.DotNetPagedListPickerAlias,
-                        DataEditorConstants.DotNetPrefetchListPickerAlias,
-                        DataEditorConstants.DotNetRadioButtonPickerAlias,
-                        DataEditorConstants.DotNetTypeaheadListPickerAlias,
-                        DataEditorConstants.EnumCheckBoxPickerAlias,
-                        DataEditorConstants.EnumDropDownPickerAlias,
-                        DataEditorConstants.EnumPrefetchListPickerAlias,
-                        DataEditorConstants.EnumRadioButtonPickerAlias,
-                        DataEditorConstants.JsonCheckBoxPickerAlias,
-                        DataEditorConstants.JsonDropDownPickerAlias,
-                        DataEditorConstants.JsonPagedListPickerAlias,
-                        DataEditorConstants.JsonPrefetchListPickerAlias,
-                        DataEditorConstants.JsonRadioButtonPickerAlias,
-                        DataEditorConstants.JsonTypeaheadListPickerAlias,
-                        DataEditorConstants.LuceneCheckBoxPickerAlias,
-                        DataEditorConstants.LuceneDropDownPickerAlias,
-                        DataEditorConstants.LucenePagedListPickerAlias,
-                        DataEditorConstants.LucenePrefetchListPickerAlias,
-                        DataEditorConstants.LuceneRadioButtonPickerAlias,
-                        DataEditorConstants.LuceneTypeaheadListPickerAlias,
-                        DataEditorConstants.SqlCheckBoxPickerAlias,
-                        DataEditorConstants.SqlDropDownPickerAlias,
-                        DataEditorConstants.SqlPagedListPickerAlias,
-                        DataEditorConstants.SqlPrefetchListPickerAlias,
-                        DataEditorConstants.SqlRadioButtonPickerAlias,
-                        DataEditorConstants.SqlTypeaheadListPickerAlias,
-                        DataEditorConstants.XmlCheckBoxPickerAlias,
-                        DataEditorConstants.XmlDropDownPickerAlias,
-                        DataEditorConstants.XmlPagedListPickerAlias,
-                        DataEditorConstants.XmlPrefetchListPickerAlias,
-                        DataEditorConstants.XmlRadioButtonPickerAlias,
-                        DataEditorConstants.XmlTypeaheadListPickerAlias
-                    }
-                 .Contains(propertyEditorAlias);
+            return new string[]
+                {
+                    DataEditorConstants.DotNetCheckBoxPickerAlias,
+                    DataEditorConstants.DotNetDropDownPickerAlias,
+                    DataEditorConstants.DotNetPagedListPickerAlias,
+                    DataEditorConstants.DotNetPrefetchListPickerAlias,
+                    DataEditorConstants.DotNetRadioButtonPickerAlias,
+                    DataEditorConstants.DotNetTypeaheadListPickerAlias,
+                    DataEditorConstants.EnumCheckBoxPickerAlias,
+                    DataEditorConstants.EnumDropDownPickerAlias,
+                    DataEditorConstants.EnumPrefetchListPickerAlias,
+                    DataEditorConstants.EnumRadioButtonPickerAlias,
+                    DataEditorConstants.JsonCheckBoxPickerAlias,
+                    DataEditorConstants.JsonDropDownPickerAlias,
+                    DataEditorConstants.JsonPagedListPickerAlias,
+                    DataEditorConstants.JsonPrefetchListPickerAlias,
+                    DataEditorConstants.JsonRadioButtonPickerAlias,
+                    DataEditorConstants.JsonTypeaheadListPickerAlias,
+                    DataEditorConstants.LuceneCheckBoxPickerAlias,
+                    DataEditorConstants.LuceneDropDownPickerAlias,
+                    DataEditorConstants.LucenePagedListPickerAlias,
+                    DataEditorConstants.LucenePrefetchListPickerAlias,
+                    DataEditorConstants.LuceneRadioButtonPickerAlias,
+                    DataEditorConstants.LuceneTypeaheadListPickerAlias,
+                    DataEditorConstants.SqlCheckBoxPickerAlias,
+                    DataEditorConstants.SqlDropDownPickerAlias,
+                    DataEditorConstants.SqlPagedListPickerAlias,
+                    DataEditorConstants.SqlPrefetchListPickerAlias,
+                    DataEditorConstants.SqlRadioButtonPickerAlias,
+                    DataEditorConstants.SqlTypeaheadListPickerAlias,
+                    DataEditorConstants.XmlCheckBoxPickerAlias,
+                    DataEditorConstants.XmlDropDownPickerAlias,
+                    DataEditorConstants.XmlPagedListPickerAlias,
+                    DataEditorConstants.XmlPrefetchListPickerAlias,
+                    DataEditorConstants.XmlRadioButtonPickerAlias,
+                    DataEditorConstants.XmlTypeaheadListPickerAlias
+                }
+                .Contains(propertyEditorAlias);
+        }
+
+        public override object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+        {
+            // source should come from ConvertSource and be a string (or null) already
+            return inter;
         }
 
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Element;
+
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(string);
+
         /// <summary>
         /// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by the current page
         /// https://our.umbraco.org/forum/developing-packages/85047-context-property-value-converters
@@ -87,8 +108,9 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
             int contextId = -1;
             int parentId = -1;
 
+            IPublishedContent assignedContentItem = owner as IPublishedContent;
 
-            if (owner is IPublishedContent assignedContentItem)
+            if (assignedContentItem != null)
             {
                 contextId = assignedContentItem.Id;
 
@@ -99,30 +121,32 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
             }
 
             return new Picker(
-                        contextId,
-                        parentId,
-                        propertyType.EditorAlias,
-                        propertyType.DataType.Id,
-                        propertyType.Alias,
-                        inter);
+                contextId,
+                parentId,
+                propertyType.EditorAlias,
+                propertyType.DataType.Id,
+                propertyType.Alias,
+                inter);
         }
 
         /// <summary>
-        /// Override the default behavour which duck types (converting a string that looks like a number into a number)
+        /// Override the default behav our which duck types (converting a string that looks like a number into a number)
         /// to always return a string (or null)
         /// </summary>
         /// <param name="propertyType"></param>
         /// <param name="source">expected as a string</param>
         /// <param name="preview">flag to indicate if in preview mode</param>
         /// <returns>source as a string, or null</returns>
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source,
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType,
+            object source,
             bool preview)
         {
-            return source as string;
-        }
-
-
+            var attempt = source.TryConvertTo<string>();
 
+            if (attempt.Success)
+                return attempt.Result;
 
+            return null;
+        }
     }
 }
\ No newline at end of file

From 92a7436fd32c4d9b0240572d2d050e6eb3e1a3dd Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Fri, 8 Nov 2019 15:27:57 +0000
Subject: [PATCH 39/43] Change Value Convert to use Picker instead of String

---
 source/nuPickers/PickerPropertyValueConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index 4efbfe2..d92cd82 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -92,7 +92,7 @@ public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType
             => PropertyCacheLevel.Element;
 
         public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
-            => typeof(string);
+            => typeof(Picker);
 
         /// <summary>
         /// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by the current page

From 651efc0869e33e6cbece4f11e0250094d9a0742a Mon Sep 17 00:00:00 2001
From: Ismail Mayat <ismailm123@gmail.com>
Date: Wed, 13 Nov 2019 11:21:30 +0000
Subject: [PATCH 40/43] remove notimplemented which is currently generating
 errors in log

---
 source/nuPickers/Components/CacheInvalidationComponent.cs | 4 ++--
 source/nuPickers/Components/EmbeddedResourceCompontent.cs | 4 ++--
 source/nuPickers/Components/RelationMappingComponent.cs   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/nuPickers/Components/CacheInvalidationComponent.cs b/source/nuPickers/Components/CacheInvalidationComponent.cs
index 68cbd8c..2c9741c 100644
--- a/source/nuPickers/Components/CacheInvalidationComponent.cs
+++ b/source/nuPickers/Components/CacheInvalidationComponent.cs
@@ -22,7 +22,7 @@ public CacheInvalidationComponent(ContentService contentService, DataTypeService
 
         public void Dispose()
         {
-            throw new NotImplementedException();
+
         }
 
         public ISite Site { get; set; }
@@ -39,7 +39,7 @@ public void Initialize()
 
         public void Terminate()
         {
-            throw new NotImplementedException();
+
         }
 
         private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
diff --git a/source/nuPickers/Components/EmbeddedResourceCompontent.cs b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
index d6f88c8..a9369f2 100644
--- a/source/nuPickers/Components/EmbeddedResourceCompontent.cs
+++ b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
@@ -20,7 +20,7 @@ public EmbeddedResourceCompontent(IProfilingLogger profilingLogger)
 
         public void Dispose()
         {
-            throw new NotImplementedException();
+
         }
 
         public ISite Site { get; set; }
@@ -46,7 +46,7 @@ public void Initialize()
 
         public void Terminate()
         {
-            throw new NotImplementedException();
+
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Components/RelationMappingComponent.cs b/source/nuPickers/Components/RelationMappingComponent.cs
index 0febbb8..8c0d4b7 100644
--- a/source/nuPickers/Components/RelationMappingComponent.cs
+++ b/source/nuPickers/Components/RelationMappingComponent.cs
@@ -41,7 +41,7 @@ public void Initialize()
 
         public void Terminate()
         {
-            throw new NotImplementedException();
+
         }
 
        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)

From 2f3d835fe6e14bb52d70d7b3d4f9f15ad99b85b8 Mon Sep 17 00:00:00 2001
From: Mark Bowser <mark@proworks.com>
Date: Thu, 16 Jan 2020 12:46:02 -0800
Subject: [PATCH 41/43] Ensure that saveFormat is saved as a string for every
 property editor

---
 .../DotNetCheckBoxPickerConfiguration.cs                  | 2 +-
 .../DotNetCheckBoxPickerConfigurationEditor.cs            | 4 +++-
 .../DotNetDropDownPickerConfiguration.cs                  | 2 +-
 .../DotNetDropDownPickerConfigurationEditor.cs            | 2 +-
 .../DotNetPagedListPickerConfigurationEditor.cs           | 6 ++++++
 .../DotNetPrefetchListPickerConfigurationEditor.cs        | 6 ++++++
 .../DotNetRadioButtonPickerConfigurationEditor.cs         | 6 ++++++
 .../DotNetTypeaheadListPickerConfiguration.cs             | 2 +-
 .../DotNetTypeaheadListPickerConfigurationEditor.cs       | 6 ++++++
 .../EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs | 2 +-
 .../EnumCheckBoxPickerConfigurationEditor.cs              | 4 +++-
 .../EnumDropDownPicker/EnumDropDownPickerConfiguration.cs | 2 +-
 .../EnumDropDownPickerConfigurationEditor.cs              | 2 +-
 .../EnumPrefetchListPickerConfigurationEditor.cs          | 6 ++++++
 .../EnumRadioButtonPickerConfigurationEditor.cs           | 6 ++++++
 .../JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs | 2 +-
 .../JsonCheckBoxPickerConfigurationEditor.cs              | 5 ++++-
 .../JsonDropDownPicker/JsonDropDownPickerConfiguration.cs | 2 +-
 .../JsonDropDownPickerConfigurationEditor.cs              | 3 ++-
 .../JsonPagedListPickerConfigurationEditor.cs             | 6 ++++++
 .../JsonPrefetchListPickerConfiguration.cs                | 2 +-
 .../JsonPrefetchListPickerConfigurationEditor.cs          | 6 ++++++
 .../JsonRadioButtonPickerConfigurationEditor.cs           | 6 ++++++
 .../JsonTypeaheadListPickerConfiguration.cs               | 2 +-
 .../JsonTypeaheadListPickerConfigurationEditor.cs         | 6 ++++++
 .../LuceneCheckBoxPickerConfiguration.cs                  | 2 +-
 .../LuceneCheckBoxPickerConfigurationEditor.cs            | 4 +++-
 .../LuceneDropDownPickerConfiguration.cs                  | 2 +-
 .../LuceneDropDownPickerConfigurationEditor.cs            | 3 ++-
 .../LucenePagedListPickerConfiguration.cs                 | 2 +-
 .../LucenePagedListPickerConfigurationEditor.cs           | 6 ++++++
 .../LucenePrefetchListPickerConfiguration.cs              | 2 +-
 .../LucenePrefetchListPickerConfigurationEditor.cs        | 6 ++++++
 .../LuceneRadioButtonPickerConfiguration.cs               | 2 +-
 .../LuceneRadioButtonPickerConfigurationEditor.cs         | 8 +++++++-
 .../LuceneTypeaheadListPickerConfiguration.cs             | 2 +-
 .../LuceneTypeaheadListPickerConfigurationEditor.cs       | 6 ++++++
 .../SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs   | 2 +-
 .../SqlCheckBoxPickerConfigurationEditor.cs               | 4 +++-
 .../SqlDropDownPicker/SqlDropDownPickerConfiguration.cs   | 2 +-
 .../SqlDropDownPickerConfigurationEditor.cs               | 2 +-
 .../SqlPagedListPicker/SqlPagedListPickerConfiguration.cs | 2 +-
 .../SqlPagedListPickerConfigurationEditor.cs              | 6 ++++++
 .../SqlPrefetchListPickerConfiguration.cs                 | 2 +-
 .../SqlPrefetchListPickerConfigurationEditor.cs           | 6 ++++++
 .../SqlRadioButtonPickerConfiguration.cs                  | 2 +-
 .../SqlRadioButtonPickerConfigurationEditor.cs            | 6 ++++++
 .../SqlTypeaheadListPickerConfiguration.cs                | 2 +-
 .../SqlTypeaheadListPickerConfigurationEditor.cs          | 6 ++++++
 49 files changed, 153 insertions(+), 32 deletions(-)

diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
index bad51c8..adc9d92 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -27,6 +27,6 @@ internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
index fc43929..9a1b78f 100644
--- a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
@@ -110,7 +110,9 @@ public override DotNetCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                output.SaveFormat = saveFormatObj;
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
 
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
index 0690380..257cd4b 100644
--- a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
@@ -8,7 +8,7 @@ internal class DotNetDropDownPickerConfiguration : ValueListConfiguration
         public object DataSource { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
index 6675efc..d596b21 100644
--- a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
@@ -104,7 +104,7 @@ public override DotNetDropDownPickerConfiguration FromConfigurationEditor(IDicti
             }
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
+                var convertString = saveFormatObj.TryConvertTo<string>();
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
index 9a87060..86c4cf2 100644
--- a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
@@ -112,6 +112,12 @@ public override DotNetPagedListPickerConfiguration FromConfigurationEditor(IDict
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
index ad6db0b..865c06d 100644
--- a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
@@ -110,6 +110,12 @@ public override DotNetPrefetchListPickerConfiguration FromConfigurationEditor(ID
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
index 5c6bd64..cd38405 100644
--- a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
@@ -107,6 +107,12 @@ public override DotNetRadioButtonPickerConfiguration FromConfigurationEditor(IDi
             {
                     output.DataSource = dataSourceObj;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
index 27de6c4..2766654 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
@@ -22,6 +22,6 @@ internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
index 0c4a162..7d58082 100644
--- a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
@@ -110,6 +110,12 @@ public override DotNetTypeaheadListPickerConfiguration FromConfigurationEditor(I
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
index d9a84f2..d0566f5 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -25,6 +25,6 @@ internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
index 0ac3353..9ce7bfa 100644
--- a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -110,7 +110,9 @@ public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                output.SaveFormat = saveFormatObj;
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
 
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
index 0018b11..2a8d025 100644
--- a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
@@ -8,7 +8,7 @@ public class EnumDropDownPickerConfiguration : ValueListConfiguration
         public object DataSource { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
index bdeaca6..d91e56c 100644
--- a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
@@ -104,7 +104,7 @@ public override EnumDropDownPickerConfiguration FromConfigurationEditor(IDiction
             }
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
+                var convertString = saveFormatObj.TryConvertTo<string>();
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
index b089c30..933badf 100644
--- a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
@@ -110,6 +110,12 @@ public override EnumPrefetchListPickerConfiguration FromConfigurationEditor(IDic
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
index b2fdfca..c393429 100644
--- a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
@@ -106,6 +106,12 @@ public override EnumRadioButtonPickerConfiguration FromConfigurationEditor(IDict
             {
                     output.DataSource = dataSourceObj;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
index 91275ea..d13f497 100644
--- a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
@@ -20,7 +20,7 @@ internal class JsonCheckBoxPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
     }
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
index b78513b..06d6189 100644
--- a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
@@ -113,8 +113,11 @@ public override JsonCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                    output.SaveFormat = saveFormatObj;
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
+
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
index 749333b..a9998c4 100644
--- a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
@@ -14,7 +14,7 @@ internal class JsonDropDownPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
 
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
index 9172ce8..c6fdee5 100644
--- a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
@@ -106,10 +106,11 @@ public override JsonDropDownPickerConfiguration FromConfigurationEditor(IDiction
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
+                var convertString = saveFormatObj.TryConvertTo<string>();
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
+
             if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
             {
                 var convertString = relationMappingObj.TryConvertTo<object>();
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
index 14366fd..b46b08e 100644
--- a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
@@ -112,6 +112,12 @@ public override JsonPagedListPickerConfiguration FromConfigurationEditor(IDictio
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
index 8867439..1a4a802 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -29,6 +29,6 @@ internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
index 73ee0c8..855fbc1 100644
--- a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
@@ -110,6 +110,12 @@ public override JsonPrefetchListPickerConfiguration FromConfigurationEditor(IDic
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
index 838dcb3..444372d 100644
--- a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
@@ -109,6 +109,12 @@ public override JsonRadioButtonPickerConfiguration FromConfigurationEditor(IDict
             {
                     output.DataSource = dataSourceObj;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
index 18b6708..64d8c20 100644
--- a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
@@ -31,6 +31,6 @@ internal class JsonTypeaheadListPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
index 688099e..eae63d3 100644
--- a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
@@ -113,6 +113,12 @@ public override JsonTypeaheadListPickerConfiguration FromConfigurationEditor(IDi
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
index 7fd4003..4116078 100644
--- a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
@@ -31,6 +31,6 @@ internal class LuceneCheckBoxPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
index 559fe27..e1c99d6 100644
--- a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
@@ -111,7 +111,9 @@ public override LuceneCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                output.SaveFormat = saveFormatObj;
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
 
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
index 346243d..32a7ea8 100644
--- a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
@@ -11,7 +11,7 @@ internal class LuceneDropDownPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
         [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
         public bool UseLabel { get; set; }
     }
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
index 1f5f364..600f4d3 100644
--- a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
@@ -106,10 +106,11 @@ public override LuceneDropDownPickerConfiguration FromConfigurationEditor(IDicti
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
+                var convertString = saveFormatObj.TryConvertTo<string>();
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
+
             if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
             {
                 var convertString = relationMappingObj.TryConvertTo<object>();
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
index 11a9846..089682c 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -29,6 +29,6 @@ internal class LucenePagedListPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
index c742230..18e8321 100644
--- a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
@@ -112,6 +112,12 @@ public override LucenePagedListPickerConfiguration FromConfigurationEditor(IDict
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
index 3015ad4..654cdaa 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -32,6 +32,6 @@ internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
index 5e83300..50f0970 100644
--- a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
@@ -112,6 +112,12 @@ public override LucenePrefetchListPickerConfiguration FromConfigurationEditor(ID
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
index 111c332..d056f3d 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
@@ -26,6 +26,6 @@ internal class LuceneRadioButtonPickerConfiguration : ValueListConfiguration
 
         [ConfigurationField("saveFormat", "Save Format",
             EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
index 727cc8f..86509ca 100644
--- a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
@@ -103,7 +103,13 @@ public override LuceneRadioButtonPickerConfiguration FromConfigurationEditor(IDi
             }
             if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
             {
-                    output.DataSource = dataSourceObj;
+                output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
index 1f78130..ed260eb 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
@@ -23,6 +23,6 @@ internal class LuceneTypeaheadListPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
index 93f008e..e5608fa 100644
--- a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
@@ -113,6 +113,12 @@ public override LuceneTypeaheadListPickerConfiguration FromConfigurationEditor(I
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
index 5209673..da3876c 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
@@ -23,6 +23,6 @@ internal class SqlCheckBoxPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
index e27552e..b0053da 100644
--- a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
@@ -111,7 +111,9 @@ public override SqlCheckBoxPickerConfiguration FromConfigurationEditor(
 
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                output.SaveFormat = saveFormatObj;
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
             }
 
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
index 3830657..dd5f173 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -14,7 +14,7 @@ internal class SqlDropDownPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
 
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
index 3c0d9cc..a2ee87e 100644
--- a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
@@ -106,7 +106,7 @@ public override SqlDropDownPickerConfiguration FromConfigurationEditor(IDictiona
             }
             if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
             {
-                var convertString = saveFormatObj.TryConvertTo<object>();
+                var convertString = saveFormatObj.TryConvertTo<string>();
                 if (convertString.Success)
                     output.SaveFormat = convertString.Result;
             }
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
index 79b82d6..51a171b 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
@@ -24,6 +24,6 @@ internal class SqlPagedListPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
index bc0e3c0..5e8ff6f 100644
--- a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
@@ -112,6 +112,12 @@ public override SqlPagedListPickerConfiguration FromConfigurationEditor(IDiction
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
index cbdf2b3..76c0b93 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
@@ -24,6 +24,6 @@ internal class SqlPrefetchListPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
index 13c18c2..6f36ee8 100644
--- a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
@@ -113,6 +113,12 @@ public override SqlPrefetchListPickerConfiguration FromConfigurationEditor(IDict
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
index 191c9cb..c80cc7a 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
@@ -21,6 +21,6 @@ internal class SqlRadioButtonPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
index 54ce2c6..d3d8142 100644
--- a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
@@ -105,6 +105,12 @@ public override SqlRadioButtonPickerConfiguration FromConfigurationEditor(IDicti
             {
                     output.DataSource = dataSourceObj;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
index 4d72740..e29f1f6 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
@@ -24,6 +24,6 @@ internal class SqlTypeaheadListPickerConfiguration : ValueListConfiguration
         public object RelationMapping { get; set; }
 
         [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public object SaveFormat { get; set; }
+        public string SaveFormat { get; set; }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
index 984736e..c2ae269 100644
--- a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
@@ -113,6 +113,12 @@ public override SqlTypeaheadListPickerConfiguration FromConfigurationEditor(IDic
                 if (convertString.Success)
                     output.DataSource = convertString.Result;
             }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
             if (editorValues.TryGetValue("customLabel", out var customlabelObj))
             {
                 var convertString = customlabelObj.TryConvertTo<string>();

From 7f93b1f38220eed85c9fe5f4837a1a7ac04ab99b Mon Sep 17 00:00:00 2001
From: Ric Carey <ric.carey@northernwolf.marketing>
Date: Tue, 5 May 2020 17:45:03 +0100
Subject: [PATCH 42/43] upgraded to latest version of Umbraco + fixed issue
 with null check on render macro by injecting UmbracoComponentRenderer

---
 .../Shared/CustomLabel/CustomLabel.cs         | 13 ++++++-
 source/nuPickers/Shared/Editor/Editor.cs      | 17 +++++++--
 .../Shared/RelationMapping/RelationMapping.cs |  4 +-
 source/nuPickers/nuPickers.csproj             | 38 +++++++++----------
 source/nuPickers/packages.config              | 10 ++---
 5 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 87f9bfb..a3fe6fb 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -3,8 +3,10 @@
 using System.Linq;
 using System.Web;
 using nuPickers.Shared.Editor;
+using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
 using Umbraco.Web.Composing;
 
 namespace nuPickers.Shared.CustomLabel
@@ -23,14 +25,20 @@ internal class CustomLabel
 
         private string PropertyAlias { get; set; }
 
+        
+
+        private readonly IUmbracoComponentRenderer _componentRenderer;
+
         /// <summary>
         ///
         /// </summary>
         /// <param name="macroAlias">alias of Macro to execute</param>
         /// <param name="contextId">node, media or member id</param>
         /// <param name="propertyAlias">property alias</param>
-        internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
+        internal CustomLabel(string macroAlias, int contextId, string propertyAlias, IUmbracoComponentRenderer componentRenderer)
         {
+            _componentRenderer = componentRenderer;
+
             MacroAlias = macroAlias;
             ContextId = contextId;
             PropertyAlias = propertyAlias;
@@ -52,6 +60,7 @@ internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
                 if (contextNode != null)
                 {
                     HttpContext.Current.Items["pageID"] = contextNode.Id;
+                    ContextId = contextNode.Id;
                     HasMacroContext = true;
                 }
             }
@@ -118,7 +127,7 @@ private string ProcessMacro(string key, string label, string keys, int counter,
         /// <param name="properties"></param>
         private string RenderToString(Macro macro, Dictionary<string, object> properties)
         {
-            return Current.UmbracoHelper.RenderMacro(macro.Alias, properties).ToHtmlString();
+            return _componentRenderer.RenderMacro(ContextId, macro.Alias, properties).ToHtmlString();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/Editor/Editor.cs b/source/nuPickers/Shared/Editor/Editor.cs
index 8509fd1..998933d 100644
--- a/source/nuPickers/Shared/Editor/Editor.cs
+++ b/source/nuPickers/Shared/Editor/Editor.cs
@@ -10,9 +10,20 @@ namespace nuPickers.Shared.Editor
     using System.Collections.Generic;
     using System.Linq;
     using Umbraco.Core;
+    using Umbraco.Core.Composing;
+    using Umbraco.Web;
 
     internal static class Editor
     {
+
+        public static IFactory Factory
+        => Umbraco.Core.Composing.Current.Factory;
+
+        public static IUmbracoComponentRenderer UmbracoComponentRenderer
+                 => Factory.GetInstance<IUmbracoComponentRenderer>();
+
+
+
         /// <summary>
         /// Get a collection of all the (key/label) items for a picker (with optional typeahead)
         /// </summary>
@@ -39,7 +50,7 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
 
                 // if the datasource didn't handle the typeahead text, then it needs to be done here (post custom label processing ?)
@@ -78,7 +89,7 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
 
                 // ensure sort order matches order of keys supplied
@@ -122,7 +133,7 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
             }
 
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
index 46981c2..45b8b54 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
@@ -96,13 +96,13 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                 }
 
                 // check current context is of the correct object type (as according to the relation type)
-                if (Current.Services.EntityService.GetObjectType(contextId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ChildObjectType))
+                if (Current.Services.EntityService.GetObjectType(contextId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ChildObjectType.Value))
                 {
                     // for each picked item
                     foreach (int pickedId in pickedIds)
                     {
                         // check picked item context if of the correct object type (as according to the relation type)
-                        if (Current.Services.EntityService.GetObjectType(pickedId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ParentObjectType))
+                        if (Current.Services.EntityService.GetObjectType(pickedId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ParentObjectType.Value))
                         {
                             // if relation doesn't already exist (new picked item)
                             if (!relations.Exists(x => x.ParentId == pickedId))
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 2f5bbee..fe05688 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -38,13 +38,11 @@
     <Reference Include="AutoMapper.Net4">
       <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="CookComputing.XmlRpcV2">
       <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
@@ -53,9 +51,8 @@
       <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Examine, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.2\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a">
       <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -290,21 +287,20 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UmbracoCms.Core.8.1.1\lib\net472\Umbraco.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.8.6.1\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Examine.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Examine.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/source/nuPickers/packages.config b/source/nuPickers/packages.config
index 85d862f..7c9c87b 100644
--- a/source/nuPickers/packages.config
+++ b/source/nuPickers/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
-  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="Examine" version="1.0.2" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
@@ -57,7 +57,7 @@
   <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.1.1" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.1.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.6.1" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.6.1" targetFramework="net472" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 0510f38694f9d4a28e8c6529ecd4d7348dec7793 Mon Sep 17 00:00:00 2001
From: niekvanderreest <niekvanderreest@hotmail.com>
Date: Mon, 9 Nov 2020 13:37:25 +0100
Subject: [PATCH 43/43] Fixed issue for nuPickers added to Membertypes

When a nuPicker is added to a custum MemberType and an instcance of that membertype is loaded through use of the memberservice i.e. Umbraco.Web.Composing.Current.UmbracoHelper.Member(id), the PickerPropertyValueConverter throws an error on line: 117.

The check assignedContentItem.Parent != null appears not to be a valid check for IMember eventhough it's successfully cast to IPublishedContent, the fix works around the check by getting the parent id from the Path property.
---
 source/nuPickers/PickerPropertyValueConverter.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index d92cd82..3dde894 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -113,11 +113,8 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
             if (assignedContentItem != null)
             {
                 contextId = assignedContentItem.Id;
-
-                if (assignedContentItem.Parent != null)
-                {
-                    parentId = assignedContentItem.Parent.Id;
-                }
+                var pathIds = assignedContentItem.Path?.Split(new char[] { ',' }).Select(id => Convert.ToInt32(id)).ToArray();
+                parentId = pathIds.Count() >= 2 ? pathIds[pathIds.Count() - 2] : parentId;
             }
 
             return new Picker(
@@ -149,4 +146,4 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             return null;
         }
     }
-}
\ No newline at end of file
+}