diff --git a/app/api/GoogleHomeApi.php b/app/api/GoogleHomeApi.php
index ab64249..694ce73 100644
--- a/app/api/GoogleHomeApi.php
+++ b/app/api/GoogleHomeApi.php
@@ -1,13 +1,11 @@
 <?php
 class GoogleHomeApi {
-	public static function response()
-	{
+	static function response(){
 		set_time_limit (20);
 		$json = file_get_contents('php://input');
 		$obj = json_decode($json, true);
 
 		$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
-
 		header('Content-Type: application/json');
 
 		switch ($obj['inputs'][0]['intent']) {
@@ -42,7 +40,7 @@ class GoogleHomeApi {
 
 					$tempDevice = [
 						'id' => (string) $subDeviceData['subdevice_id'],
-						'type' => GoogleHomeDeviceTypes::getEquivalent($subDeviceData['type']),
+						'type' => GoogleHomeDeviceTypes::getAction($subDeviceData['type']),
 						'name' => [
 							'name' => $deviceData['name'],
 						],
@@ -50,37 +48,11 @@ class GoogleHomeApi {
 						'roomHint' => $roomData['name']
 					];
 
-					//traids
-					switch ($subDeviceData['type']) {
-						case 'on/off':
-						$tempDevice['traits'] = [ 'action.devices.traits.OnOff' ];
-						break;
-
-						case 'temp_cont':
-						$tempDevice['attributes'] = [
-							"availableThermostatModes" => "off,heat,on",
-							"thermostatTemperatureRange" => [
-								'minThresholdCelsius' => 5,
-								'maxThresholdCelsius' => 15,
-							],
-							"thermostatTemperatureUnit" => "C",
-							"commandOnlyTemperatureSetting" => false,
-							"queryOnlyTemperatureSetting" => false,
-							"bufferRangeCelsius" => 0,
-						];
-						$tempDevice['traits'] = [
-							'action.devices.traits.TemperatureSetting',
-						];
-						break;
-					}
-
-
+					//traids & Attributes
+					$tempDevice = GoogleHomeDeviceTypes::getSyncObj($tempDevice, GoogleHomeDeviceTypes::getAction($subDeviceData['type']));
 					$devices[] = $tempDevice;
-
 				}
 			}
-
-
 		}
 
 
diff --git a/app/models/types/GoogleHomeDeviceTypes.php b/app/models/types/GoogleHomeDeviceTypes.php
index 161b3f8..40c7700 100644
--- a/app/models/types/GoogleHomeDeviceTypes.php
+++ b/app/models/types/GoogleHomeDeviceTypes.php
@@ -1,82 +1,111 @@
 <?php
 class GoogleHomeDeviceTypes {
-	private static $wordBook = [
+	/*const AirConditioningUnit	   = 'action.devices.types.AC_UNIT';
+	const AirFreshener 			   = 'action.devices.types.AIRFRESHENER';
+	const AirPurifier             = 'action.devices.types.AIRPURIFIER';
+	const Awning 					   = 'action.devices.types.AWNING';
+	const Bathtub 					   = 'action.devices.types.BATHTUB';
+	const Bed 					 	   = 'action.devices.types.BED';
+	const Blender				 	   = 'action.devices.types.BLENDER';
+	const Blinds					   = 'action.devices.types.BLINDS';
+	const Boiler					   = 'action.devices.types.BOILER';
+	const Camera					   = 'action.devices.types.CAMERA';
+	const CarbonMonoxideDetector	= 'action.devices.types.CARBON_MONOXIDE_DETECTOR';
+	const Charger						= 'action.devices.types.CHARGER';
+	const Closet						= 'action.devices.types.CLOSET';
+	const CoffeeMaker					= 'action.devices.types.COFFEE_MAKER';
+	const Cooktop						= 'action.devices.types.COOKTOP';
+	const Curtain						= 'action.devices.types.CURTAIN';
+	const Dehumidifier				= 'action.devices.types.DEHUMIDIFIER';
+	const Dehydrator					= 'action.devices.types.DEHYDRATOR';
+	const Dishwasher					= 'action.devices.types.DISHWASHER';
+	const Door							= 'action.devices.types.DOOR';
+	const Drawer						= 'action.devices.types.DRAWER';
+	const Dryer							= 'action.devices.types.DRYER';
+	const Fan							= 'action.devices.types.FAN';
+	const Faucet						= 'action.devices.types.FAUCET';
+	const Fireplace					= 'action.devices.types.FIREPLACE';
+	const Fryer                   = 'action.devices.types.FRYER';
+	const GarageDoor              = 'action.devices.types.GARAGE';
+	const Gate							= 'action.devices.types.GATE';
+	const Grill							= 'action.devices.types.GRILL';
+	const Heater						= 'action.devices.types.HEATER';
+	const Hood							= 'action.devices.types.HOOD';
+	const Humidifier					= 'action.devices.types.HUMIDIFIER';
+	const Kettle						= 'action.devices.types.KETTLE';
+	const Light							= 'action.devices.types.LIGHT';
+	const Lock							= 'action.devices.types.LOCK';
+	const MediaRemote					= 'action.devices.types.REMOTECONTROL';
+	const Mop							= 'action.devices.types.MOP';
+	const Mower							= 'action.devices.types.MOWER';
+	const Microwave					= 'action.devices.types.MICROWAVE';
+	const Multicooker					= 'action.devices.types.MULTICOOKER';
+	const Network						= 'action.devices.types.NETWORK';
+
+	const Oven							= 'action.devices.types.OVEN';
+	const Pergola						= 'action.devices.types.PERGOLA';
+	const PetFeeder					= 'action.devices.types.PETFEEDER';
+	const PressureCooker				= 'action.devices.types.PRESSURECOOKER';
+	const Radiator						= 'action.devices.types.RADIATOR';
+	const Refrigerator				= 'action.devices.types.REFRIGERATOR';
+	const Router						= 'action.devices.types.ROUTER';
+	const Scene							= 'action.devices.types.SCENE';
+	const Sensor						= 'action.devices.types.SENSOR';
+	const SecuritySystem				= 'action.devices.types.SECURITYSYSTEM';
+	const SettopBox					= 'action.devices.types.SETTOP';
+	const Shutter						= 'action.devices.types.SHUTTER';
+	const Shower						= 'action.devices.types.SHOWER';
+	const SmokeDetector				= 'action.devices.types.SMOKE_DETECTOR';
+	const SousVide						= 'action.devices.types.SOUSVIDE';
+	const Sprinkler					= 'action.devices.types.SPRINKLER';
+	const StandMixer					= 'action.devices.types.STANDMIXER';
+	const Switch						= 'action.devices.types.SWITCH';
+	const Television					= 'action.devices.types.TV';
+	const Thermostat					= 'action.devices.types.THERMOSTAT';
+	const Vacuum						= 'action.devices.types.VACUUM';
+	const Valve							= 'action.devices.types.VALVE';
+	const Washer						= 'action.devices.types.WASHER';
+	const WaterHeater					= 'action.devices.types.WATERHEATER';
+	const WaterPurifier				= 'action.devices.types.WATERPURIFIER';
+	const WaterSoftener				= 'action.devices.types.WATERSOFTENER';
+	const Window						= 'action.devices.types.WINDOW';
+	const YogurtMaker					= 'action.devices.types.YOGURTMAKER';*/
+
+	private static $actionWordBook = [
 		'on/off' 	=> 'action.devices.types.OUTLET',
 		'temp_cont'	=> 'action.devices.types.THERMOSTAT',
-
-		/*const AirConditioningUnit	   = 'action.devices.types.AC_UNIT';
-		const AirFreshener 			   = 'action.devices.types.AIRFRESHENER';
-		const AirPurifier             = 'action.devices.types.AIRPURIFIER';
-		const Awning 					   = 'action.devices.types.AWNING';
-		const Bathtub 					   = 'action.devices.types.BATHTUB';
-		const Bed 					 	   = 'action.devices.types.BED';
-		const Blender				 	   = 'action.devices.types.BLENDER';
-		const Blinds					   = 'action.devices.types.BLINDS';
-		const Boiler					   = 'action.devices.types.BOILER';
-		const Camera					   = 'action.devices.types.CAMERA';
-		const CarbonMonoxideDetector	= 'action.devices.types.CARBON_MONOXIDE_DETECTOR';
-		const Charger						= 'action.devices.types.CHARGER';
-		const Closet						= 'action.devices.types.CLOSET';
-		const CoffeeMaker					= 'action.devices.types.COFFEE_MAKER';
-		const Cooktop						= 'action.devices.types.COOKTOP';
-		const Curtain						= 'action.devices.types.CURTAIN';
-		const Dehumidifier				= 'action.devices.types.DEHUMIDIFIER';
-		const Dehydrator					= 'action.devices.types.DEHYDRATOR';
-		const Dishwasher					= 'action.devices.types.DISHWASHER';
-		const Door							= 'action.devices.types.DOOR';
-		const Drawer						= 'action.devices.types.DRAWER';
-		const Dryer							= 'action.devices.types.DRYER';
-		const Fan							= 'action.devices.types.FAN';
-		const Faucet						= 'action.devices.types.FAUCET';
-		const Fireplace					= 'action.devices.types.FIREPLACE';
-		const Fryer                   = 'action.devices.types.FRYER';
-		const GarageDoor              = 'action.devices.types.GARAGE';
-		const Gate							= 'action.devices.types.GATE';
-		const Grill							= 'action.devices.types.GRILL';
-		const Heater						= 'action.devices.types.HEATER';
-		const Hood							= 'action.devices.types.HOOD';
-		const Humidifier					= 'action.devices.types.HUMIDIFIER';
-		const Kettle						= 'action.devices.types.KETTLE';
-		const Light							= 'action.devices.types.LIGHT';
-		const Lock							= 'action.devices.types.LOCK';
-		const MediaRemote					= 'action.devices.types.REMOTECONTROL';
-		const Mop							= 'action.devices.types.MOP';
-		const Mower							= 'action.devices.types.MOWER';
-		const Microwave					= 'action.devices.types.MICROWAVE';
-		const Multicooker					= 'action.devices.types.MULTICOOKER';
-		const Network						= 'action.devices.types.NETWORK';
-
-		const Oven							= 'action.devices.types.OVEN';
-		const Pergola						= 'action.devices.types.PERGOLA';
-		const PetFeeder					= 'action.devices.types.PETFEEDER';
-		const PressureCooker				= 'action.devices.types.PRESSURECOOKER';
-		const Radiator						= 'action.devices.types.RADIATOR';
-		const Refrigerator				= 'action.devices.types.REFRIGERATOR';
-		const Router						= 'action.devices.types.ROUTER';
-		const Scene							= 'action.devices.types.SCENE';
-		const Sensor						= 'action.devices.types.SENSOR';
-		const SecuritySystem				= 'action.devices.types.SECURITYSYSTEM';
-		const SettopBox					= 'action.devices.types.SETTOP';
-		const Shutter						= 'action.devices.types.SHUTTER';
-		const Shower						= 'action.devices.types.SHOWER';
-		const SmokeDetector				= 'action.devices.types.SMOKE_DETECTOR';
-		const SousVide						= 'action.devices.types.SOUSVIDE';
-		const Sprinkler					= 'action.devices.types.SPRINKLER';
-		const StandMixer					= 'action.devices.types.STANDMIXER';
-		const Switch						= 'action.devices.types.SWITCH';
-		const Television					= 'action.devices.types.TV';
-		const Thermostat					= 'action.devices.types.THERMOSTAT';
-		const Vacuum						= 'action.devices.types.VACUUM';
-		const Valve							= 'action.devices.types.VALVE';
-		const Washer						= 'action.devices.types.WASHER';
-		const WaterHeater					= 'action.devices.types.WATERHEATER';
-		const WaterPurifier				= 'action.devices.types.WATERPURIFIER';
-		const WaterSoftener				= 'action.devices.types.WATERSOFTENER';
-		const Window						= 'action.devices.types.WINDOW';
-		const YogurtMaker					= 'action.devices.types.YOGURTMAKER';*/
 	];
 
-	static function getEquivalent($type){
+	static function getAction($deviceType){
+		return self::$actionWordBook[$deviceType];
+	}
+
+	static function getSyncObj($deviceBaseObj, $deviceType){
+		switch ($deviceType) {
+			case 'action.devices.types.OUTLET':
+			$deviceBaseObj['traits'] = 'action.devices.traits.OnOff';
+			break;
+			case 'action.devices.types.THERMOSTAT':
+			$deviceBaseObj['traits'] = [
+				'action.devices.traits.TemperatureSetting',
+			];
+			$deviceBaseObj['attributes'] = [
+				"availableThermostatModes" => "off,heat,on",
+				"thermostatTemperatureRange" => [
+					'minThresholdCelsius' => 5,
+					'maxThresholdCelsius' => 30,
+				],
+				"thermostatTemperatureUnit" => "C",
+				"commandOnlyTemperatureSetting" => false,
+				"queryOnlyTemperatureSetting" => false,
+				"bufferRangeCelsius" => 0,
+			];
+			break;
+		}
+		return $deviceBaseObj;
+	}
+
+	static function getQueryJson($deviceType, $type){
 		return self::$wordBook[$type];
 	}
 }