diff --git a/platforms/ZWayServer.js b/platforms/ZWayServer.js
index 5b79c8e..70c2d6e 100644
--- a/platforms/ZWayServer.js
+++ b/platforms/ZWayServer.js
@@ -89,11 +89,11 @@ ZWayServerPlatform.prototype = {
         //TODO: Unify this with getVDevServices, so there's only one place with mapping between service and vDev type.
         //Note: Order matters!
         var primaryDeviceClasses = [
-            "switchBinary",
             "thermostat",
-            "sensorBinary.Door/Window",
             "sensorMultilevel.Temperature",
-            "switchMultilevel"
+            "switchMultilevel",
+            "switchBinary",
+            "sensorBinary.Door/Window"
         ];
 
         var that = this;
@@ -226,24 +226,24 @@ ZWayServerAccessory.prototype = {
         var typeKey = ZWayServerPlatform.getVDevTypeKey(vdev);
         var services = [], service;
         switch (typeKey) {
-            case "switchBinary":
-                services.push(new Service.Switch(vdev.metrics.title));
-                break;
-            case "switchMultilevel":
-                services.push(new Service.Lightbulb(vdev.metrics.title));
-                break;
-            case "thermostat":
+             case "thermostat":
                 services.push(new Service.Thermostat(vdev.metrics.title));
                 break;
             case "sensorMultilevel.Temperature":
                 services.push(new Service.TemperatureSensor(vdev.metrics.title));
                 break;
-            case "sensorBinary.Door/Window":
-                services.push(new Service.GarageDoorOpener(vdev.metrics.title));
+            case "switchMultilevel":
+                services.push(new Service.Lightbulb(vdev.metrics.title));
                 break;
             case "battery.Battery":
                 services.push(new Service.BatteryService(vdev.metrics.title));
                 break;
+            case "switchBinary":
+                services.push(new Service.Switch(vdev.metrics.title));
+                break;
+            case "sensorBinary.Door/Window":
+                services.push(new Service.GarageDoorOpener(vdev.metrics.title));
+                break;
             case "sensorMultilevel.Luminiscence":
                 services.push(new Service.LightSensor(vdev.metrics.title));
                 break;