diff --git a/src/Tor/ClientCreateParams.cs b/src/Tor/ClientCreateParams.cs
index 8cec8fb..72b1168 100644
--- a/src/Tor/ClientCreateParams.cs
+++ b/src/Tor/ClientCreateParams.cs
@@ -192,9 +192,6 @@ public override string ToString()
             builder.Append("--allow-missing-torrc ");
             builder.AppendFormat("--ControlPort {0}", controlPort);
 
-            /** TEMPORARY: DELETE LATER **/
-            builder.AppendFormat(" --SocksPort 9050");
-
             if (!string.IsNullOrWhiteSpace(configurationFile))
                 builder.AppendFormat(" -f \"{0}\"", configurationFile);
 
diff --git a/src/Tor/Configuration/Configuration.cs b/src/Tor/Configuration/Configuration.cs
index 823f005..24f7420 100644
--- a/src/Tor/Configuration/Configuration.cs
+++ b/src/Tor/Configuration/Configuration.cs
@@ -139,6 +139,15 @@ public int ControlPort
             set { SetValue(ConfigurationNames.ControlPort, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the data directory path.
+        /// </summary>
+        public string DataDirectory
+        {
+            get { return GetValue(ConfigurationNames.DataDirectory) as string; }
+            set { SetValue(ConfigurationNames.DataDirectory, value); }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether the Tor application shouldn't listen for accept any connections other than control connections.
         /// </summary>
diff --git a/src/Tor/Configuration/Enumerators/ConfigurationNames.cs b/src/Tor/Configuration/Enumerators/ConfigurationNames.cs
index 7e53a8b..ac2d401 100644
--- a/src/Tor/Configuration/Enumerators/ConfigurationNames.cs
+++ b/src/Tor/Configuration/Enumerators/ConfigurationNames.cs
@@ -43,6 +43,9 @@ public enum ConfigurationNames
         [ConfigurationAssoc("ConstrainedSockSize", Default = 8388608.0, Type = typeof(Bytes), Validation = ConfigurationValidation.NonNull | ConfigurationValidation.SizeDivision)]
         ConstrainedSockSize,
 
+        [ConfigurationAssoc("DataDirectory", Default = null, Type = typeof(string))]
+        DataDirectory,
+
         [ConfigurationAssoc("DisableNetwork", Default = false, Type = typeof(bool))]
         DisableNetwork,