diff --git a/extensions b/extensions
index 2954ff06..b8f63465 160000
--- a/extensions
+++ b/extensions
@@ -1 +1 @@
-Subproject commit 2954ff0671a595875479ed6cbec3f8d1819de00e
+Subproject commit b8f634654fda6f0c629ca12ad62f0c44da59b109
diff --git a/src/ParticleData/ParticleData.cuh b/src/ParticleData/ParticleData.cuh
index 5c6ab5ef..79a85f5a 100644
--- a/src/ParticleData/ParticleData.cuh
+++ b/src/ParticleData/ParticleData.cuh
@@ -101,7 +101,10 @@
 //List here all the properties with this syntax:
 /*       ((PropertyName, propertyName, TYPE))				\      */
 //The preprocessor ensures that they are included wherever is needed
-#define ALL_PROPERTIES_LIST ((Pos, pos, real4))     \
+#ifndef EXTRA_PARTICLE_PROPERTIES 
+#define EXTRA_PARTICLE_PROPERTIES 
+#endif
+#define IMPL_ALL_PROPERTIES_LIST ((Pos, pos, real4))	\
                             ((Id, id, int))	       \
                             ((Mass, mass, real))       \
 			    ((Force, force, real4))    \
@@ -112,7 +115,14 @@
       			    ((Charge, charge, real))   \
 			    ((Torque, torque, real4))  \
   			    ((AngVel, angVel, real4))  \
-  			    ((Dir, dir, real4))
+  			    ((Dir, dir, real4)) EXTRA_PARTICLE_PROPERTIES
+/*
+			    ((Torque, torque, real4))  \
+  			    ((AngVel, angVel, real4))  \
+  			    ((Dir, dir, real4))        \
+
+*/
+#define ALL_PROPERTIES_LIST  IMPL_ALL_PROPERTIES_LIST
 
 //Get the Name (first letter capital) from a tuple in the property list
 #define PROPNAME_CAPS(tuple) BOOST_PP_TUPLE_ELEM(3, 0 ,tuple)
diff --git a/src/misc/ParameterUpdatable.h b/src/misc/ParameterUpdatable.h
index ba489277..95f5459b 100644
--- a/src/misc/ParameterUpdatable.h
+++ b/src/misc/ParameterUpdatable.h
@@ -1,4 +1,4 @@
-/*Raul P. Pelaez 2017.
+/*Raul P. Pelaez 2017-2021.
 
   A parameter communication interface, anything that inherits from ParameterUpdatable can be called through update* to communicate a parameter change using a common interface. Parameters related with the particle data are communicated using ParticleData (like number of particles).
 
@@ -20,13 +20,16 @@
 #include"utils/Box.cuh"
 
 
+#ifndef EXTRA_UPDATABLE_PARAMETERS
+#define EXTRA_UPDATABLE_PARAMETERS 
+#endif
 //Add here any parameter you want along its type, after adding it here the function updateWHATEVER(type) will
 //be available for all ParameterUpdatable modules
 #define PARAMETER_LIST ((TimeStep, real)) \
                        ((SimulationTime, real)) \
                        ((Box, Box)) \
                        ((Temperature, real)) \
-                       ((Viscosity, real))
+                       ((Viscosity, real)) EXTRA_UPDATABLE_PARAMETERS
 
 
 
diff --git a/src/uammd.cuh b/src/uammd.cuh
index 79145581..cf9e8edd 100644
--- a/src/uammd.cuh
+++ b/src/uammd.cuh
@@ -1,8 +1,14 @@
+/* Raul P. Pelaez 2017-2021. Main UAMMD include.
 
+ */
+#ifndef UAMMD_CUH
+#define UAMMD_CUH
 
-
-
+#ifdef UAMMD_EXTENSIONS 
+#include "../extensions/preamble.h"
+#endif
 
 #include "System/System.h"
 #include "ParticleData/ParticleData.cuh"
-#include "ParticleData/ParticleGroup.cuh"
\ No newline at end of file
+#include "ParticleData/ParticleGroup.cuh"
+#endif