diff --git a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListDataEditor.cs b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListDataEditor.cs
index 5ef6c8f343..7dd97d2196 100644
--- a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListDataEditor.cs
+++ b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListDataEditor.cs
@@ -8,151 +8,171 @@ using umbraco.interfaces;
 
 namespace umbraco.editorControls.XPathCheckBoxList
 {
-	/// <summary>
-	/// Renders a CheckBoxList using with option nodes obtained by an XPath expression
-	/// </summary>
-	public class XPathCheckBoxListDataEditor : CompositeControl, IDataEditor
-	{
-		/// <summary>
-		/// Field for the data.
-		/// </summary>
-		private IData data;
+    /// <summary>
+    /// Renders a CheckBoxList using with option nodes obtained by an XPath expression
+    /// </summary>
+    public class XPathCheckBoxListDataEditor : CompositeControl, IDataEditor
+    {
+        /// <summary>
+        /// Field for the data.
+        /// </summary>
+        private IData data;
 
-		/// <summary>
-		/// Field for the options.
-		/// </summary>
-		private XPathCheckBoxListOptions options;
+        /// <summary>
+        /// Field for the options.
+        /// </summary>
+        private XPathCheckBoxListOptions options;
 
-		/// <summary>
-		/// Field for the checkbox list.
-		/// </summary>
-		private CheckBoxList checkBoxList = new CheckBoxList();
+        /// <summary>
+        /// Field for the checkbox list.
+        /// </summary>
+        private CheckBoxList checkBoxList = new CheckBoxList();
 
-		/// <summary>
-		/// Gets a value indicating whether [treat as rich text editor].
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if [treat as rich text editor]; otherwise, <c>false</c>.
-		/// </value>
-		public virtual bool TreatAsRichTextEditor
-		{
-			get
-			{
-				return false;
-			}
-		}
+        /// <summary>
+        /// Gets a value indicating whether [treat as rich text editor].
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if [treat as rich text editor]; otherwise, <c>false</c>.
+        /// </value>
+        public virtual bool TreatAsRichTextEditor
+        {
+            get
+            {
+                return false;
+            }
+        }
 
-		/// <summary>
-		/// Gets a value indicating whether [show label].
-		/// </summary>
-		/// <value><c>true</c> if [show label]; otherwise, <c>false</c>.</value>
-		public virtual bool ShowLabel
-		{
-			get
-			{
-				return true;
-			}
-		}
+        /// <summary>
+        /// Gets a value indicating whether [show label].
+        /// </summary>
+        /// <value><c>true</c> if [show label]; otherwise, <c>false</c>.</value>
+        public virtual bool ShowLabel
+        {
+            get
+            {
+                return true;
+            }
+        }
 
-		/// <summary>
-		/// Gets the editor.
-		/// </summary>
-		/// <value>The editor.</value>
-		public Control Editor
-		{
-			get
-			{
-				return this;
-			}
-		}
+        /// <summary>
+        /// Gets the editor.
+        /// </summary>
+        /// <value>The editor.</value>
+        public Control Editor
+        {
+            get
+            {
+                return this;
+            }
+        }
 
-		/// <summary>
-		/// Initializes a new instance of XPathCheckBoxListDataEditor
-		/// </summary>
-		/// <param name="data"></param>
-		/// <param name="options"></param>
-		internal XPathCheckBoxListDataEditor(IData data, XPathCheckBoxListOptions options)
-		{
-			this.data = data;
-			this.options = options;
-		}
+        /// <summary>
+        /// Initializes a new instance of XPathCheckBoxListDataEditor
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="options"></param>
+        internal XPathCheckBoxListDataEditor(IData data, XPathCheckBoxListOptions options)
+        {
+            this.data = data;
+            this.options = options;
+        }
 
-		/// <summary>
-		/// Called by the ASP.NET page framework to notify server controls that use composition-based implementation to create any child controls they contain in preparation for posting back or rendering.
-		/// </summary>
-		protected override void CreateChildControls()
-		{
-			this.checkBoxList.DataSource = uQuery.GetNodesByXPath(this.options.XPath).ToNameIds();
-			this.checkBoxList.DataTextField = "Value";
-			this.checkBoxList.DataValueField = this.options.UseIds ? "Key" : "Value";
-			this.checkBoxList.DataBind();
+        /// <summary>
+        /// Called by the ASP.NET page framework to notify server controls that use composition-based implementation to create any child controls they contain in preparation for posting back or rendering.
+        /// </summary>
+        protected override void CreateChildControls()
+        {
+            switch (this.options.UmbracoObjectType)
+            {
+                case uQuery.UmbracoObjectType.Unknown:
+                case uQuery.UmbracoObjectType.Document:
 
-			this.Controls.Add(this.checkBoxList);
-		}
+                    this.checkBoxList.DataSource = uQuery.GetNodesByXPath(this.options.XPath).Where(x => x.Id != -1).ToNameIds();
+                    break;
 
-		/// <summary>
-		/// Raises the <see cref="E:System.Web.UI.Control.Load"/> event.
-		/// </summary>
-		/// <param name="e">The <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad(e);
-			this.EnsureChildControls();
+                case uQuery.UmbracoObjectType.Media:
 
-			if (!this.Page.IsPostBack && this.data.Value != null)
-			{
-				string value = this.data.Value.ToString();
-				List<string> selectedValues = new List<string>();
+                    this.checkBoxList.DataSource = uQuery.GetMediaByXPath(this.options.XPath).Where(x => x.Id != -1).ToNameIds();
+                    break;
 
-				if (xmlHelper.CouldItBeXml(value))
-				{
-					// build selected values from XML fragment
-					foreach (XElement nodeXElement in XElement.Parse(value).Elements())
-					{
-						selectedValues.Add(nodeXElement.Value);
-					}
-				}
-				else
-				{
-					// Assume a CSV source
-					selectedValues = value.Split(',').ToList();
-				}
+                case uQuery.UmbracoObjectType.Member:
 
-				// Find checkboxes where values match the stored values and set to selected
-				ListItem checkBoxListItem = null;
-				foreach (string selectedValue in selectedValues)
-				{
-					checkBoxListItem = this.checkBoxList.Items.FindByValue(selectedValue);
-					if (checkBoxListItem != null)
-					{
-						checkBoxListItem.Selected = true;
-					}
-				}
-			}
-		}
+                    this.checkBoxList.DataSource = uQuery.GetMembersByXPath(this.options.XPath).ToNameIds();
+                    break;
+            }
 
-		/// <summary>
-		/// Called by Umbraco when saving the node
-		/// </summary>
-		public void Save()
-		{
-			// Get all checked item values
-			IEnumerable<string> selectedOptions = from ListItem item in this.checkBoxList.Items
-												  where item.Selected
-												  select item.Value;
+            this.checkBoxList.DataTextField = "Value";
+            this.checkBoxList.DataValueField = this.options.UseIds ? "Key" : "Value";
+            this.checkBoxList.DataBind();
 
-			if (this.options.UseXml)
-			{
-				string elementName = this.options.UseIds ? "nodeId" : "nodeName";
+            this.Controls.Add(this.checkBoxList);
+        }
 
-				this.data.Value = new XElement("XPathCheckBoxList",
-					selectedOptions.Select(x => new XElement(elementName, x.ToString()))).ToString();
-			}
-			else
-			{
-				// Save the CSV
-				this.data.Value = string.Join(",", selectedOptions.ToArray());
-			}
-		}
-	}
+        /// <summary>
+        /// Raises the <see cref="E:System.Web.UI.Control.Load"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="T:System.EventArgs"/> object that contains the event data.</param>
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            this.EnsureChildControls();
+
+            if (!this.Page.IsPostBack && this.data.Value != null)
+            {
+                string value = this.data.Value.ToString();
+                List<string> selectedValues = new List<string>();
+
+                if (xmlHelper.CouldItBeXml(value))
+                {
+                    // build selected values from XML fragment
+                    foreach (XElement nodeXElement in XElement.Parse(value).Elements())
+                    {
+                        selectedValues.Add(nodeXElement.Value);
+                    }
+                }
+                else
+                {
+                    // Assume a CSV source
+                    selectedValues = value.Split(',').ToList();
+                }
+
+                // Find checkboxes where values match the stored values and set to selected
+                ListItem checkBoxListItem = null;
+                foreach (string selectedValue in selectedValues)
+                {
+                    checkBoxListItem = this.checkBoxList.Items.FindByValue(selectedValue);
+                    if (checkBoxListItem != null)
+                    {
+                        checkBoxListItem.Selected = true;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called by Umbraco when saving the node
+        /// </summary>
+        public void Save()
+        {
+            // Get all checked item values
+            IEnumerable<string> selectedOptions = from ListItem item in this.checkBoxList.Items
+                                                    where item.Selected
+                                                    select item.Value;
+
+            if (this.options.UseXml)
+            {
+                string elementName = this.options.UseIds ? "nodeId" : "nodeName";
+
+                this.data.Value = new XElement(
+                                        "XPathCheckBoxList",
+                                        selectedOptions.Select(x => new XElement(elementName, x.ToString())))
+                                        .ToString();
+            }
+            else
+            {
+                // Save the CSV
+                this.data.Value = string.Join(",", selectedOptions.ToArray());
+            }
+        }
+    }
 }
diff --git a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListOptions.cs b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListOptions.cs
index 7c8905d912..374951cf66 100644
--- a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListOptions.cs
+++ b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListOptions.cs
@@ -1,45 +1,77 @@
-using System.ComponentModel;
-using umbraco.cms.businesslogic.datatype;
+using System;
+using System.ComponentModel;
 
 namespace umbraco.editorControls.XPathCheckBoxList
 {
-	/// <summary>
-	/// Data Class, used to store the configuration options for the XPathCheckBoxListPreValueEditor
-	/// </summary>
-	public class XPathCheckBoxListOptions : AbstractOptions
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="XPathCheckBoxListOptions"/> class.
-		/// </summary>
-		public XPathCheckBoxListOptions()
-		{
-		}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="XPathCheckBoxListOptions"/> class.
-		/// </summary>
-		/// <param name="loadDefaults">if set to <c>true</c> [load defaults].</param>
-		public XPathCheckBoxListOptions(bool loadDefaults)
-			: base(loadDefaults)
-		{
-		}
+    /// <summary>
+    /// DataType configuration options for the XPath CheckBoxList
+    /// </summary>
+    public class XPathCheckBoxListOptions : AbstractOptions
+    {
+        /// <summary>
+        /// string guid for either a node, media or member
+        /// </summary>
+        private string type = null;
 
-		/// <summary>
-		/// XPath string used to get Nodes to be used as CheckBox options in a CheckBoxList
-		/// </summary>
-		[DefaultValue("")]
-		public string XPath { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XPathCheckBoxListOptions"/> class.
+        /// </summary>
+        public XPathCheckBoxListOptions()
+            : base(true)
+        {
+        }
 
-		/// <summary>
-		/// Defaults to true, where the property value will be stored as an Xml Fragment, else if false, a Csv will be stored
-		/// </summary>
-		[DefaultValue(true)]
-		public bool UseXml { get; set; }
+        /// <summary>
+        /// Gets or sets the guid as a string representing either a Document, Media or Member
+        /// </summary>
+        public string Type
+        {
+            get
+            {
+                // null check for the type, as older versions of this data type won't have this value stored
+                if (this.type == null)
+                {
+                    return uQuery.UmbracoObjectType.Document.GetGuid().ToString();
+                }
 
-		/// <summary>
-		/// Defaults to true, where property value stored is NodeIds, else if false, then value stored is the Node Names
-		/// </summary>
-		[DefaultValue(true)]
-		public bool UseIds { get; set; }
-	}
+                return this.type;
+            }
+
+            set
+            {
+                this.type = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the XPath string used to get the Nodes, Media or Members
+        /// </summary>     
+        [DefaultValue("//*")]
+        public string XPath { get; set; }
+
+        /// <summary>
+        /// Defaults to true, where the property value will be stored as an Xml Fragment, else if false, a Csv will be stored
+        /// </summary>
+        [DefaultValue(true)]
+        public bool UseXml { get; set; }
+
+        /// <summary>
+        /// Defaults to true, where property value stored is NodeIds, else if false, then value stored is the Node Names
+        /// </summary>
+        [DefaultValue(true)]
+        public bool UseIds { get; set; }
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from the stored string guid
+        /// </summary>
+        /// <value>a Document, Media or Member</value>
+        public uQuery.UmbracoObjectType UmbracoObjectType
+        {
+            get
+            {
+                return uQuery.GetUmbracoObjectType(new Guid(this.Type));
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs
index 2064ff818b..6d528b32c0 100644
--- a/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs
+++ b/src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs
@@ -7,183 +7,217 @@ using System.Linq;
 
 namespace umbraco.editorControls.XPathCheckBoxList
 {
-	/// <summary>
-	/// This PreValueEditor will require an XPath expression to define the nodes to pick as CheckBox options,
-	/// TODO: [HR] min / max selections ?
-	/// Uses the shared JsonPreValueEditor as nice way of lightweight serializing a config data class object into a single DB field
-	/// </summary>
-	class XPathCheckBoxListPreValueEditor : AbstractJsonPrevalueEditor
-	{
-		/// <summary>
-		/// DropDownList for specifying the database column type.
-		/// </summary>
-		private DropDownList dbTypeDropDownList = new DropDownList();
+    /// <summary>
+    /// This PreValueEditor will require an XPath expression to define the nodes to pick as CheckBox options,
+    /// TODO: [HR] min / max selections ?
+    /// Uses the shared JsonPreValueEditor as nice way of lightweight serializing a config data class object into a single DB field
+    /// </summary>
+    class XPathCheckBoxListPreValueEditor : AbstractJsonPrevalueEditor
+    {
+        /// <summary>
+        /// Radio buttons to select type of node to pick from: Content / Media / Members
+        /// </summary>
+        private RadioButtonList typeRadioButtonList = new RadioButtonList();
 
-		/// <summary>
-		/// TextBox control to get the XPath expression
-		/// </summary>
-		private TextBox xPathTextBox = new TextBox();
+        /// <summary>
+        /// TextBox control to get the XPath expression
+        /// </summary>
+        private TextBox xPathTextBox = new TextBox();
 
-		/// <summary>
-		/// RequiredFieldValidator to ensure an XPath expression has been entered
-		/// </summary>
-		private RequiredFieldValidator xPathRequiredFieldValidator = new RequiredFieldValidator();
+        /// <summary>
+        /// RequiredFieldValidator to ensure an XPath expression has been entered
+        /// </summary>
+        private RequiredFieldValidator xPathRequiredFieldValidator = new RequiredFieldValidator();
 
-		/// <summary>
-		/// Server side validation of XPath expression, to ensure some nodes are returned
-		/// </summary>
-		private CustomValidator xPathCustomValidator = new CustomValidator();
+        /// <summary>
+        /// Server side validation of XPath expression
+        /// </summary>
+        private CustomValidator xPathCustomValidator = new CustomValidator();
 
-		/// <summary>
-		/// Store an Xml fragment or a Csv
-		/// </summary>
-		private RadioButtonList storageTypeRadioButtonList = new RadioButtonList() { RepeatDirection = RepeatDirection.Vertical, RepeatLayout = RepeatLayout.Flow };
+        /// <summary>
+        /// Store an Xml fragment or a Csv
+        /// </summary>
+        private RadioButtonList storageTypeRadioButtonList = new RadioButtonList() { RepeatDirection = RepeatDirection.Vertical, RepeatLayout = RepeatLayout.Flow };
 
-		/// <summary>
-		/// Select Node IDs or Node Names as the values to store
-		/// </summary>
-		private DropDownList valueTypeDropDownList = new DropDownList();
+        /// <summary>
+        /// Select Node IDs or Node Names as the values to store
+        /// </summary>
+        private DropDownList valueTypeDropDownList = new DropDownList();
 
-		/// <summary>
-		/// Data object used to define the configuration status of this PreValueEditor
-		/// </summary>
-		private XPathCheckBoxListOptions options = null;
+        /// <summary>
+        /// Data object used to define the configuration status of this PreValueEditor
+        /// </summary>
+        private XPathCheckBoxListOptions options = null;
 
-		/// <summary>
-		/// Gets the options data object that represents the current state of this datatypes configuration
-		/// </summary>
-		internal XPathCheckBoxListOptions Options
-		{
-			get
-			{
-				if (this.options == null)
-				{
-					// Deserialize any stored settings for this PreValueEditor instance
-					this.options = this.GetPreValueOptions<XPathCheckBoxListOptions>();
+        /// <summary>
+        /// Gets the options data object that represents the current state of this datatypes configuration
+        /// </summary>
+        internal XPathCheckBoxListOptions Options
+        {
+            get
+            {
+                if (this.options == null)
+                {
+                    // Deserialize any stored settings for this PreValueEditor instance
+                    this.options = this.GetPreValueOptions<XPathCheckBoxListOptions>();
 
-					// If still null, ie, object couldn't be de-serialized from PreValue[0] string value
-					if (this.options == null)
-					{
-						// Create a new Options data object with the default values
-						this.options = new XPathCheckBoxListOptions(true);
-					}
-				}
-				return this.options;
-			}
-		}
+                    // If still null, ie, object couldn't be de-serialized from PreValue[0] string value
+                    if (this.options == null)
+                    {
+                        // Create a new Options data object with the default values
+                        this.options = new XPathCheckBoxListOptions();
+                    }
+                }
 
-		/// <summary>
-		/// Initialize a new instance of XPathCheckBoxlistPreValueEditor
-		/// </summary>
-		/// <param name="dataType">XPathCheckBoxListDataType</param>
+                return this.options;
+            }
+        }
+
+        /// <summary>
+        /// Initialize a new instance of XPathCheckBoxlistPreValueEditor
+        /// </summary>
+        /// <param name="dataType">XPathCheckBoxListDataType</param>
         public XPathCheckBoxListPreValueEditor(umbraco.cms.businesslogic.datatype.BaseDataType dataType)
-			: base(dataType)
-		{
-		}
+            : base(dataType, cms.businesslogic.datatype.DBTypes.Ntext)
+        {
+        }
 
-		/// <summary>
-		/// Creates all of the controls and assigns all of their properties
-		/// </summary>
-		protected override void CreateChildControls()
-		{
-			this.xPathTextBox.ID = "xPathTextBox";
-			this.xPathTextBox.CssClass = "umbEditorTextField";
+        /// <summary>
+        /// Creates all of the controls and assigns all of their properties
+        /// </summary>
+        protected override void CreateChildControls()
+        {
+            //radio buttons to select type of nodes that can be picked (Document, Media or Member)
+            this.typeRadioButtonList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Document.GetFriendlyName(), uQuery.UmbracoObjectType.Document.GetGuid().ToString()));
+            this.typeRadioButtonList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Media.GetFriendlyName(), uQuery.UmbracoObjectType.Media.GetGuid().ToString()));
+            this.typeRadioButtonList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Member.GetFriendlyName(), uQuery.UmbracoObjectType.Member.GetGuid().ToString()));
+            
+            this.xPathTextBox.ID = "xPathTextBox";
+            this.xPathTextBox.CssClass = "umbEditorTextField";
 
-			this.xPathRequiredFieldValidator.ControlToValidate = this.xPathTextBox.ID;
-			this.xPathRequiredFieldValidator.Display = ValidatorDisplay.Dynamic;
-			this.xPathRequiredFieldValidator.ErrorMessage = " XPath expression required";
+            this.xPathRequiredFieldValidator.ControlToValidate = this.xPathTextBox.ID;
+            this.xPathRequiredFieldValidator.Display = ValidatorDisplay.Dynamic;
+            this.xPathRequiredFieldValidator.ErrorMessage = " XPath expression required";
 
-			this.xPathCustomValidator.ControlToValidate = this.xPathTextBox.ID;
-			this.xPathCustomValidator.Display = ValidatorDisplay.Dynamic;
-			this.xPathCustomValidator.ServerValidate += new ServerValidateEventHandler(XPathCustomValidator_ServerValidate);
+            this.xPathCustomValidator.ControlToValidate = this.xPathTextBox.ID;
+            this.xPathCustomValidator.Display = ValidatorDisplay.Dynamic;
+            this.xPathCustomValidator.ServerValidate += new ServerValidateEventHandler(this.XPathCustomValidator_ServerValidate);
 
-			this.storageTypeRadioButtonList.ID = "storageTypeRadioButtonList";
-			this.storageTypeRadioButtonList.Items.Add(new ListItem("Xml", bool.TrueString));
-			this.storageTypeRadioButtonList.Items.Add(new ListItem("Csv", bool.FalseString));
+            this.storageTypeRadioButtonList.ID = "storageTypeRadioButtonList";
+            this.storageTypeRadioButtonList.Items.Add(new ListItem("Xml", bool.TrueString));
+            this.storageTypeRadioButtonList.Items.Add(new ListItem("Csv", bool.FalseString));
 
-			this.valueTypeDropDownList.ID = "valueTypeDropDownList";
-			this.valueTypeDropDownList.Items.Add(new ListItem("Node Ids", bool.TrueString));
-			this.valueTypeDropDownList.Items.Add(new ListItem("Node Names", bool.FalseString));
+            this.valueTypeDropDownList.ID = "valueTypeDropDownList";
+            this.valueTypeDropDownList.Items.Add(new ListItem("Node Ids", bool.TrueString));
+            this.valueTypeDropDownList.Items.Add(new ListItem("Node Names", bool.FalseString));
 
-			this.Controls.AddPrevalueControls(
-				this.dbTypeDropDownList,
-				this.xPathTextBox,
-				this.xPathRequiredFieldValidator,
-				this.xPathCustomValidator,
-				this.storageTypeRadioButtonList,
-				this.valueTypeDropDownList);
-		}
+            this.Controls.AddPrevalueControls(
+                this.typeRadioButtonList,
+                this.xPathTextBox,
+                this.xPathRequiredFieldValidator,
+                this.xPathCustomValidator,
+                this.storageTypeRadioButtonList,
+                this.valueTypeDropDownList);
+        }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="e"></param>
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad(e);
+        /// <summary>
+        /// Raises the <see cref="E:System.Web.UI.Control.Load"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="T:System.EventArgs"/> object that contains the event data.</param>
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
 
-			// Read in stored configuration values
-			this.xPathTextBox.Text = this.Options.XPath;
-			this.storageTypeRadioButtonList.SelectedValue = this.Options.UseXml.ToString();
-			this.valueTypeDropDownList.SelectedValue = this.Options.UseIds.ToString();
-		}
+            // Read in stored configuration values
+            this.typeRadioButtonList.SelectedValue = this.Options.Type;
+            this.xPathTextBox.Text = this.Options.XPath;
+            this.storageTypeRadioButtonList.SelectedValue = this.Options.UseXml.ToString();
+            this.valueTypeDropDownList.SelectedValue = this.Options.UseIds.ToString();
+        }
 
-		/// <summary>
-		/// Will run the entered XPath expression to ensure it's valid
-		/// </summary>
-		/// <param name="source">xPathCustomValidator</param>
-		/// <param name="args"></param>
-		private void XPathCustomValidator_ServerValidate(object source, ServerValidateEventArgs args)
-		{
-			string xPath = args.Value;
-			bool isValid = false;
+        /// <summary>
+        /// Will run the entered XPath expression to ensure it's valid
+        /// </summary>
+        /// <param name="source">xPathCustomValidator</param>
+        /// <param name="args"></param>
+        private void XPathCustomValidator_ServerValidate(object source, ServerValidateEventArgs args)
+        {
+            string xPath = args.Value;
+            bool isValid = false;
 
-			try
-			{
-				if (uQuery.GetNodesByXPath(xPath).Count() >= 0)
-				{
-					isValid = true;
-				}
-			}
-			catch (XPathException)
-			{
-				this.xPathCustomValidator.ErrorMessage = " Syntax error in XPath expression";
-			}
+            try
+            {
+                switch (this.options.UmbracoObjectType)
+                {
+                    case uQuery.UmbracoObjectType.Document:
+                        if (uQuery.GetNodesByXPath(xPath).Count() >= 0)
+                        {
+                            isValid = true;
+                        }
 
-			args.IsValid = isValid;
-		}
+                        break;
 
-		/// <summary>
-		/// Saves the pre value data to Umbraco
-		/// </summary>
-		public override void Save()
-		{
-			if (this.Page.IsValid)
-			{
-                // always use NText
-                base.m_DataType.DBType = cms.businesslogic.datatype.DBTypes.Ntext;
+                    case uQuery.UmbracoObjectType.Media:
+                        if (uQuery.GetMediaByXPath(xPath).Count() >= 0)
+                        {
+                            isValid = true;
+                        }
 
-				this.Options.XPath = this.xPathTextBox.Text;
-				this.Options.UseXml = bool.Parse(this.storageTypeRadioButtonList.SelectedValue);
-				this.Options.UseIds = bool.Parse(this.valueTypeDropDownList.SelectedValue);
+                        break;
 
-				this.SaveAsJson(this.Options);  // Serialize to Umbraco database field
-			}
-		}
+                    case uQuery.UmbracoObjectType.Member:
+                        if (uQuery.GetMembersByXPath(xPath).Count() >= 0)
+                        {
+                            isValid = true;
+                        }
 
-		/// <summary>
-		/// Replaces the base class writer and instead uses the shared uComponents extension method, to inject consistant markup
-		/// </summary>
-		/// <param name="writer"></param>
-		protected override void RenderContents(HtmlTextWriter writer)
-		{
-			//writer.AddPrevalueRow("Database Type", this.dbTypeDropDownList);
-            writer.AddPrevalueRow("XPath Expression", @"can use the tokens <strong>$ancestorOrSelf</strong>, <strong>$parentPage</strong> and <strong>$currentPage</strong>, eg.<br />
-                                                        <br />                                            
-                                                        all siblings: $parentPage//*[@id != $currentPage/@id] <br />                                                        
-                                                        ", this.xPathTextBox, this.xPathRequiredFieldValidator, this.xPathCustomValidator);
-			writer.AddPrevalueRow("Storage Type", this.storageTypeRadioButtonList);
-			writer.AddPrevalueRow("Values", this.valueTypeDropDownList);
-		}
-	}
+                        break;
+                }          
+            }
+            catch (XPathException)
+            {
+                this.xPathCustomValidator.ErrorMessage = " Syntax error in XPath expression";
+            }
+
+            args.IsValid = isValid;
+        }
+
+        /// <summary>
+        /// Saves the pre value data to Umbraco
+        /// </summary>
+        public override void Save()
+        {
+            if (this.Page.IsValid)
+            {
+                this.Options.Type = this.typeRadioButtonList.SelectedValue;
+                this.Options.XPath = this.xPathTextBox.Text;
+                this.Options.UseXml = bool.Parse(this.storageTypeRadioButtonList.SelectedValue);
+                this.Options.UseIds = bool.Parse(this.valueTypeDropDownList.SelectedValue);
+
+                this.SaveAsJson(this.Options);  // Serialize to Umbraco database field
+            }
+        }
+
+        /// <summary>
+        /// Replaces the base class writer and instead uses the shared uComponents extension method, to inject consistant markup
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void RenderContents(HtmlTextWriter writer)
+        {
+            writer.AddPrevalueRow(
+                "Type",
+                "the xml schema to query",
+                this.typeRadioButtonList);
+
+            writer.AddPrevalueRow(
+                "XPath Expression", 
+                "can use the tokens <strong>$ancestorOrSelf</strong>, <strong>$parentPage</strong> and <strong>$currentPage</strong>",
+                this.xPathTextBox, 
+                this.xPathRequiredFieldValidator, 
+                this.xPathCustomValidator);
+
+            writer.AddPrevalueRow("Storage Type", this.storageTypeRadioButtonList);
+            writer.AddPrevalueRow("Values", this.valueTypeDropDownList);
+        }
+    }
 }