diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php
index 2992c4d3..82118899 100644
--- a/application/core/Configurators/ScriptSettings.php
+++ b/application/core/Configurators/ScriptSettings.php
@@ -145,17 +145,18 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$pagesId = 'ScriptSettingsPages';
 		$frame   = new Frame();
 
-		$scriptInfo = $this->maniaControl->client->getModeScriptInfo();
-		/*if(isset($scriptInfo->)) {
+		//$scriptInfo = (array)$this->maniaControl->client->getModeScriptInfo();
+		$scriptInfo = $this->maniaControl->client->execute('GetModeScriptInfo');
+		if(isset($scriptInfo['faultCode'])) {
 			// Not in script mode
-			$label = new Label(); //TODO
+			$label = new Label();
 			$frame->add($label);
 			$label->setText($scriptInfo['faultString']);
 			return $frame;
-		}*/
-		$scriptParams = $scriptInfo->paramDescs;
+		}
+		$scriptParams = $scriptInfo['ParamDescs'];
 
-		$scriptSettings = (array)$this->maniaControl->client->getModeScriptSettings();
+		$scriptSettings = $this->maniaControl->client->execute('GetModeScriptSettings');
 
 		// Config
 		$pagerSize     = 9.;
@@ -192,7 +193,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$pageFrames = array();
 		$y          = 0.;
 		foreach($scriptParams as $index => $scriptParam) {
-			$settingName = $scriptParam->name;
+			$settingName = $scriptParam['Name'];
 
 			if(!isset($scriptSettings[$settingName])) {
 				continue;
@@ -259,7 +260,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			$descriptionLabel->setSize($width * 0.7, $settingHeight);
 			$descriptionLabel->setTextSize($labelTextSize);
 			$descriptionLabel->setTranslate(true);
-			$descriptionLabel->setText($scriptParam->desc);
+			$descriptionLabel->setText($scriptParam['Desc']);
 			$script->addTooltip($nameLabel, $descriptionLabel);
 
 			$y -= $settingHeight;
@@ -276,14 +277,14 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @see \ManiaControl\Configurators\ConfiguratorMenu::saveConfigData()
 	 */
 	public function saveConfigData(array $configData, Player $player) {
-		//TODO fix settings
+
 		$prefix = explode(".", $configData[3][0]['Name']);
 		if($prefix[0] != self::ACTION_PREFIX_SETTING) {
 			return;
 		}
 
-		$scriptInfo = (array)$this->maniaControl->client->getModeScriptInfo();
-
+		$scriptSettings = $this->maniaControl->client->execute('GetModeScriptSettings');
+		
 		$prefixLength = strlen(self::ACTION_PREFIX_SETTING);
 
 		$newSettings = array();
@@ -344,8 +345,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @param        $setting
 	 */
 	public function toggleBooleanSetting($setting, Player $player) {
-		$scriptInfo = (array)$this->maniaControl->client->getModeScriptInfo();
-
+		$scriptSettings = $this->maniaControl->client->execute('GetModeScriptSettings');
 		if(!isset($scriptSettings[$setting])) {
 			var_dump('no setting ' . $setting);
 			return;
diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php
index b0f4ffb2..1d1d17e9 100644
--- a/application/core/Configurators/ServerSettings.php
+++ b/application/core/Configurators/ServerSettings.php
@@ -137,7 +137,8 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		$pagesId = 'ServerSettingsPages';
 		$frame   = new Frame();
 
-		$serverSettings = $this->maniaControl->client->getServerOptions();
+		//TODO temporary
+		$serverSettings = $this->maniaControl->client->execute('GetServerOptions');
 
 		// Config
 		$pagerSize     = 9.;
@@ -268,7 +269,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		}
 
 		// Note on ServerOptions the whole Options have to be saved, otherwise a error will appear
-		$serverSettings = (array)$this->maniaControl->client->getServerOptions();
+		$serverSettings = $this->maniaControl->client->execute('GetServerOptions'); //TODO just temporary
 
 		$prefixLength = strlen(self::ACTION_PREFIX_SETTING);
 
@@ -329,12 +330,12 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		if(!$newSettings) {
 			return true;
 		}
-		//TODO not working yet
-		/*$success = $this->maniaControl->client->setServerOptions($newSettings);
+
+		$success = $this->maniaControl->client->setServerOptions($newSettings);
 		if(!$success) {
 			$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
 			return false;
-		}*/
+		}
 
 		// Save Settings into Database
 		$mysqli = $this->maniaControl->database->mysqli;
diff --git a/application/core/Maniaplanet/DedicatedServer/Connection.php b/application/core/Maniaplanet/DedicatedServer/Connection.php
index e55ff14c..eb22a955 100644
--- a/application/core/Maniaplanet/DedicatedServer/Connection.php
+++ b/application/core/Maniaplanet/DedicatedServer/Connection.php
@@ -106,8 +106,8 @@ class Connection
 	 * @param string $authLevel
 	 * @param array $params
 	 */
-	protected function execute($methodName, $params = array(), $multicall = false)
-	{
+	public function execute($methodName, $params = array(), $multicall = false)
+	{//TODO just temporary
 		if($multicall)
 		{
 			$this->xmlrpcClient->addCall($methodName, $params);