diff --git a/application/utils.inc.php b/application/utils.inc.php
index 8533f7a45..2c2283855 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -792,9 +792,13 @@ class utils
 	/**
 	 * Get target configuration file name (including full path)
 	 */
-	public static function GetConfigFilePath()
+	public static function GetConfigFilePath($sEnvironment = null)
 	{
-		return APPCONF.self::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
+		if (is_null($sEnvironment))
+		{
+			$sEnvironment = self::GetCurrentEnvironment();
+		}
+		return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
 	}
 
     /**
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index dff846f50..556ab881e 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -304,8 +304,13 @@ class RunTimeEnvironment
 		return $aRet;
 	}
 
-	public function CompileFrom($sSourceEnv, $sSourceDir = 'datamodel')
+	public function CompileFrom($sSourceEnv, $sSourceDir = null)
 	{
+		if (is_null($sSourceDir))
+		{
+			$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
+			$sSourceDir = $oSourceConfig->Get('source_dir');
+		}
 		$sSourceDirFull = APPROOT.$sSourceDir;
 		// Do load the required modules
 		//