diff --git a/extras/test/src/test_decode.cpp b/extras/test/src/test_decode.cpp
index efcfe10b4..7b66ef90e 100644
--- a/extras/test/src/test_decode.cpp
+++ b/extras/test/src/test_decode.cpp
@@ -24,7 +24,7 @@
 #include "types/automation/CloudMotionSensor.h"
 #include "types/automation/CloudSmartPlug.h"
 #include "types/automation/CloudSwitch.h"
-#include "types/automation/CloudTemperature.h"
+#include "types/automation/CloudTemperatureSensor.h"
 #include "types/automation/CloudTelevision.h"
 
 /**************************************************************************************
@@ -368,7 +368,7 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]")
   {
     PropertyContainer property_container;
         
-    CloudTemperature test;
+    CloudTemperatureSensor test;
     test = 0.0f;
     addPropertyToContainer(property_container, test, "test", Permission::ReadWrite);
 
diff --git a/src/property/PropertyContainer.h b/src/property/PropertyContainer.h
index f54028c49..50f2c1577 100644
--- a/src/property/PropertyContainer.h
+++ b/src/property/PropertyContainer.h
@@ -43,7 +43,7 @@
 #include "types/automation/CloudMotionSensor.h"
 #include "types/automation/CloudSmartPlug.h"
 #include "types/automation/CloudSwitch.h"
-#include "types/automation/CloudTemperature.h"
+#include "types/automation/CloudTemperatureSensor.h"
 #include "types/automation/CloudTelevision.h"
 
 /******************************************************************************
@@ -58,6 +58,37 @@ extern "C" unsigned long getTime();
 
 typedef std::list<Property *> PropertyContainer;
 
+typedef CloudFloat CloudEnergy;
+typedef CloudFloat CloudForce;
+typedef CloudFloat CloudTemperature;
+typedef CloudFloat CloudPower;
+typedef CloudFloat CloudElectricCurrent;
+typedef CloudFloat CloudElectricPotention;
+typedef CloudFloat CloudElectricResistance;
+typedef CloudFloat CloudCapacitance;
+typedef CloudFloat CloudTime;
+typedef CloudFloat CloudFrequency;
+typedef CloudFloat CloudDataRate;
+typedef CloudFloat CloudHeartRate;
+typedef CloudInt   CloudCounter;
+typedef CloudFloat CloudAcceleration;
+typedef CloudFloat CloudArea;
+typedef CloudFloat CloudLenght;
+typedef CloudFloat CloudVelocity;
+typedef CloudFloat CloudMass;
+typedef CloudFloat CloudVolume;
+typedef CloudFloat CloudFlowRate;
+typedef CloudFloat CloudAngle;
+typedef CloudFloat CloudIlluminance;
+typedef CloudFloat CloudLuminousFlux;
+typedef CloudFloat CloudLuminance;
+typedef CloudFloat CloudLuminousIntensity;
+typedef CloudFloat CloudLogarithmicQuantity;
+typedef CloudFloat CloudPressure;
+typedef CloudInt   CloudInformationContent;
+typedef CloudFloat CloudPercentage;
+typedef CloudFloat CloudRelativeHumidity;
+
 /******************************************************************************
    FUNCTION DECLARATION
  ******************************************************************************/
diff --git a/src/property/types/automation/CloudTemperature.h b/src/property/types/automation/CloudTemperatureSensor.h
similarity index 84%
rename from src/property/types/automation/CloudTemperature.h
rename to src/property/types/automation/CloudTemperatureSensor.h
index a82559813..69ce33eb8 100644
--- a/src/property/types/automation/CloudTemperature.h
+++ b/src/property/types/automation/CloudTemperatureSensor.h
@@ -15,30 +15,28 @@
 // a commercial license, send an email to license@arduino.cc.
 //
 
-#ifndef CLOUDTEMPERATURE_H_
-#define CLOUDTEMPERATURE_H_
+#ifndef CLOUD_TEMPERATURE_SENSOR_H_
+#define CLOUD_TEMPERATURE_SENSOR_H_
 
 /******************************************************************************
    INCLUDE
  ******************************************************************************/
 
-#include <Arduino.h>
 #include "../CloudFloat.h"
 
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
 
-
-
-class CloudTemperature : public CloudFloat {
-  private:
+class CloudTemperatureSensor : public CloudFloat
+{
   public:
-    CloudTemperature& operator=(float v) {
+
+    CloudTemperatureSensor & operator = (float v)
+    {
       CloudFloat::operator=(v);
       return *this;
     }
 };
 
-
-#endif /* CLOUDTEMPERATURE_H_ */
+#endif /* CLOUD_TEMPERATURE_SENSOR_H_ */