diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 601d70c94d..cac67dea48 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -32,18 +32,13 @@ namespace openspace::properties {
 template <typename T>
 class NumericalProperty : public TemplateProperty<T> {
 public:
-    NumericalProperty(std::string identifier, std::string guiName,
-        std::string description,
-        Property::Visibility visibility = Property::Visibility::User);
-    NumericalProperty(std::string identifier, std::string guiName,
-        std::string description, T value,
-        Property::Visibility visibility = Property::Visibility::User);
-    NumericalProperty(std::string identifier, std::string guiName, 
-        std::string description, T value, T minimumValue, T maximumValue,
-        Property::Visibility visibility = Property::Visibility::User);
-    NumericalProperty(std::string identifier, std::string guiName,
-        std::string description, T value, T minimumValue, T maximumValue, T steppingValue,
-        Property::Visibility visibility = Property::Visibility::User);
+    using Property::PropertyInfo;
+
+    NumericalProperty(PropertyInfo info);
+    NumericalProperty(PropertyInfo info, T value);
+    NumericalProperty(PropertyInfo info, T value, T minimumValue, T maximumValue);
+    NumericalProperty(PropertyInfo info, T value, T minimumValue, T maximumValue,
+        T steppingValue);
 
     bool getLuaValue(lua_State* state) const override;
     bool setLuaValue(lua_State* state) override;
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index 9d1a7a4573..7e83b15fa3 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -232,52 +232,40 @@ const std::string NumericalProperty<T>::SteppingValueKey = "SteppingValue";
 // a single constructor    
         
 template <typename T>
-NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
-                                        std::string description,
-                                        Property::Visibility visibility)
+NumericalProperty<T>::NumericalProperty(PropertyInfo info)
     : NumericalProperty<T>(
-        std::move(identifier), std::move(guiName), std::move(description),
+        std::move(info),
         PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>(),
         PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
         PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        visibility
+        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>()
     )
 {}
 
 template <typename T>
-NumericalProperty<T>::NumericalProperty(std::string identifier,
-                                        std::string guiName, std::string desc, T value,
-                                        Property::Visibility visibility)
+NumericalProperty<T>::NumericalProperty(PropertyInfo info, T value)
     : NumericalProperty<T>(
-        std::move(identifier), std::move(guiName), std::move(desc), std::move(value),
+        std::move(info),
         PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
         PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        visibility
+        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>()
     )
 {}
 
 template <typename T>
-NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
-                                        std::string description, T value, T minimumValue,
-                                        T maximumValue, Property::Visibility visibility)
+NumericalProperty<T>::NumericalProperty(PropertyInfo info, T value, T minimumValue,
+                                        T maximumValue)
     : NumericalProperty<T>(
-        std::move(identifier), std::move(guiName), std::move(description), 
+        std::move(info),
         std::move(value), std::move(minimumValue), std::move(maximumValue),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        visibility
+        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>()
     )
 {}
 
 template <typename T>
-NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
-                                        std::string description, T value,
-                                        T minimumValue, T maximumValue, T steppingValue,
-                                        Property::Visibility visibility)
-    : TemplateProperty<T>(
-        std::move(identifier), std::move(guiName), std::move(description),
-        std::move(value), visibility)
+NumericalProperty<T>::NumericalProperty(PropertyInfo info, T value,
+                                        T minimumValue, T maximumValue, T steppingValue)
+    : TemplateProperty<T>(std::move(info), std::move(value))
     , _minimumValue(std::move(minimumValue))
     , _maximumValue(std::move(maximumValue))
     , _stepping(std::move(steppingValue))
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index 444819ae0a..e2e40f33dc 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -40,6 +40,8 @@ namespace openspace::properties {
  */
 class OptionProperty : public IntProperty {
 public:
+    using Property::PropertyInfo;
+
     /**
      * The struct storing a single option consisting of an integer <code>value</code> and
      * a <code>string</code> description.
@@ -57,22 +59,23 @@ public:
     /**
      * The constructor delegating the <code>identifier</code> and the <code>guiName</code>
      * to its super class.
-     * \param identifier A unique identifier for this property
-     * \param guiName The GUI name that should be used to represent this property
+     * \param info The PropertyInfo structure that contains all the required static
+     * information for initializing this Property.
+     * \pre \p info.identifier must not be empty
+     * \pre \p info.guiName must not be empty
      */
-    OptionProperty(std::string identifier, std::string guiName, std::string description,
-        Property::Visibility visibility = Property::Visibility::User);
+    OptionProperty(PropertyInfo info);
 
     /**
     * The constructor delegating the <code>identifier</code> and the <code>guiName</code>
     * to its super class.
-    * \param identifier A unique identifier for this property
-    * \param guiName The GUI name that should be used to represent this property
+    * \param info The PropertyInfo structure that contains all the required static
+    * information for initializing this Property.
     * \param displayType Optional DisplayType for GUI (default RADIO)
+    * \pre \p info.identifier must not be empty
+    * \pre \p info.guiName must not be empty
     */
-    OptionProperty(std::string identifier, std::string guiName, std::string description,
-        DisplayType displayType,
-        Property::Visibility visibility = Property::Visibility::User);
+    OptionProperty(PropertyInfo info, DisplayType displayType);
 
     /**
      * Returns the name of the class for reflection purposes.
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index d58a9fbf94..48d5288056 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -63,9 +63,9 @@ class PropertyOwner;
 class Property {
 public:
     /**
-     * The visibility classes for Property%s. The classes are strictly ordered as
-     * All > Developer > User > Hidden
-     */
+    * The visibility classes for Property%s. The classes are strictly ordered as
+    * All > Developer > User > Hidden
+    */
     enum class Visibility {
         All = 3,  ///< Visible for all types, no matter what
         Hidden = 2, ///< Never visible
@@ -73,6 +73,21 @@ public:
         User = 0 ///< Visible in User mode
     };
 
+    /**
+     * This structure is passed to the constructor of a Property and contains the unique
+     * identifier, a GUI name and descriptive text that are both user facing.
+     */
+    struct PropertyInfo {
+        /// The unique identifier that is part of the fully qualified URI of this Property
+        std::string identifier;
+        /// The name that is displayed in the user interface
+        std::string guiName;
+        /// The user facing description of this Property
+        std::string description;
+        /// Determins the visibility of this Property in the user interface
+        Visibility visibility = Visibility::All;
+    };
+
     /// An OnChangeHandle is returned by the onChange method to uniquely identify an 
     /// onChange callback
     using OnChangeHandle = uint32_t;
@@ -87,16 +102,12 @@ public:
      * to be accessed by the GUI elements using the <code>guiName</code> key. The default
      * visibility settings is Visibility::All, whereas the default read-only state is
      * <code>false</code>.
-     * \param identifier A unique identifier for this property. It has to be unique to the
-     * PropertyOwner and cannot contain any <code>.</code>s
-     * \param guiName The human-readable GUI name for this Property
-     * \param description The human-readable description for this Property
-     * \param visibility The visibility of the Property for user interfaces
-     * \pre \p identifier must not be empty
-     * \pre \p guiName must not be empty
+     * \param info The PropertyInfo structure that contains all the required static 
+     * information for initializing this Property.
+     * \pre \p info.identifier must not be empty
+     * \pre \p info.guiName must not be empty
      */
-    Property(std::string identifier, std::string guiName, std::string description,
-        Visibility visibility = Visibility::All);
+    Property(PropertyInfo info);
 
     /**
      * The destructor taking care of deallocating all unused memory. This method will not
@@ -403,6 +414,9 @@ protected:
     /// The identifier for this Property
     std::string _identifier;
 
+    /// The GUI user-facing name of this Property
+    std::string _guiName;
+
     /// The user-facing description of this Property
     std::string _description;
 
@@ -414,6 +428,13 @@ protected:
 
 private:
     OnChangeHandle _currentHandleValue;
+
+#ifdef _DEBUG
+    // These identifiers can be used for debugging. Each Property is assigned one unique
+    // identifier.
+    static uint64_t Identifier;
+    uint64_t _id;
+#endif
 };
 
 } // namespace openspace::properties
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index d14414fdc5..3e036a90ce 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -33,14 +33,14 @@ namespace openspace::properties {
 
 class SelectionProperty : public TemplateProperty<std::vector<int>> {
 public:
+    using Property::PropertyInfo;
+
     struct Option {
         int value;
         std::string description;
     };
 
-    SelectionProperty(std::string identifier, std::string guiName,
-        std::string description,
-        Property::Visibility visibility = Property::Visibility::User);
+    SelectionProperty(PropertyInfo info);
     
     void addOption(Option option);
     void removeOptions();
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index 6f99a57353..1d6d253346 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -51,29 +51,20 @@ namespace openspace::properties {
 template <typename T>
 class TemplateProperty : public Property {
 public:
+    using Property::PropertyInfo;
     using ValueType = T;
 
-    /**
-     * The constructor initializing the TemplateProperty with the provided
-     * <code>identifier</code> and human-readable <code>guiName</code>. The default value
-     * for the stored type <code>T</code> is retrieved using the PropertyDelegate's
-     * PropertyDelegate::defaultValue method, which must be specialized for new types or
-     * a compile-error will occur.
-     * \param identifier The identifier that is used for this TemplateProperty
-     * \param guiName The human-readable GUI name for this TemplateProperty
-     */
-    //TemplateProperty(std::string identifier, std::string guiName,
-    //    Property::Visibility visibility = Visibility::User);
-
     /**
      * The constructor initializing the TemplateProperty with the provided
      * <code>identifier</code>, human-readable <code>guiName</code> and provided
      * <code>value</code>.
+     * \param info The PropertyInfo structure that contains all the required static
+     * information for initializing this Property.
+     * \pre \p info.identifier must not be empty
+     * \pre \p info.guiName must not be empty
      */
-    TemplateProperty(std::string identifier, std::string guiName,
-        std::string description,
-        T value = PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>(),
-        Property::Visibility visibility = Visibility::User);
+    TemplateProperty(PropertyInfo info,
+        T value = PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>());
 
     /**
      * Returns the class name for this TemplateProperty. The default implementation makes
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index bc927ab974..7581324390 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -158,10 +158,8 @@ namespace openspace::properties {
 //}
 
 template <typename T>
-TemplateProperty<T>::TemplateProperty(std::string identifier, std::string guiName,
-                                      std::string desc,
-                                      T value, Property::Visibility visibility)
-    : Property(std::move(identifier), std::move(guiName), std::move(desc), visibility)
+TemplateProperty<T>::TemplateProperty(PropertyInfo info, T value)
+    : Property(std::move(info))
     , _value(std::move(value))
 {}
 
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 5bc707f667..29e30f5ff6 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -38,11 +38,12 @@ public:
     /**
      * Initializes the TriggerProperty by delegating the <code>identifier</code> and
      * <code>guiName</code> to the Property constructor.
-     * \param identifier The unique identifier used for this Property
-     * \param guiName The human-readable name of this Property
+     * \param info The PropertyInfo structure that contains all the required static
+     * information for initializing this Property.
+     * \pre \p info.identifier must not be empty
+     * \pre \p info.guiName must not be empty
      */
-    TriggerProperty(std::string identifier, std::string guiName, std::string description,
-        Property::Visibility visibility = Property::Visibility::User);
+    TriggerProperty(PropertyInfo info);
 
     /**
      * Returns the class name <code>TriggerProperty</code>.
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index b0b84493cf..78525ba9e0 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -95,10 +95,10 @@ documentation::Documentation RenderableModel::Documentation() {
 RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _geometry(nullptr)
-    , _colorTexturePath("colorTexture", "Color Texture", "") // @TODO Missing documentation
-    , _performFade("performFading", "Perform Fading", "", false) // @TODO Missing documentation
-    , _performShading("performShading", "Perform Shading", "", true) // @TODO Missing documentation
-    , _fading("fading", "Fade", "", 0) // @TODO Missing documentation
+    , _colorTexturePath({ "colorTexture", "Color Texture", "" }) // @TODO Missing documentation
+    , _performFade({ "performFading", "Perform Fading", "" }, false) // @TODO Missing documentation
+    , _performShading({ "performShading", "Perform Shading", "" }, true) // @TODO Missing documentation
+    , _fading({ "fading", "Fade", "" }, 0) // @TODO Missing documentation
     , _programObject(nullptr)
     , _texture(nullptr)
     , _modelTransform(1.0)
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 0156a679e2..dddf149ec3 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -87,9 +87,9 @@ documentation::Documentation RenderablePlane::Documentation() {
 
 RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _texturePath("texture", "Texture", "") // @TODO Missing documentation
-    , _billboard("billboard", "Billboard", "", false) // @TODO Missing documentation
-    , _size("size", "Size", "", 10, 0, std::pow(10, 25)) // @TODO Missing documentation
+    , _texturePath({ "texture", "Texture", "" }) // @TODO Missing documentation
+    , _billboard({ "billboard", "Billboard", "" }, false) // @TODO Missing documentation
+    , _size({ "size", "Size", "" }, 10, 0, std::pow(10, 25)) // @TODO Missing documentation
     , _shader(nullptr)
     , _texture(nullptr)
     , _blendMode(BlendMode::Normal)
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 2b2cfb38b1..5120bc4715 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -92,11 +92,11 @@ documentation::Documentation RenderableSphere::Documentation() {
 
 RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _texturePath("texture", "Texture", "") // @TODO Missing documentation
-    , _orientation("orientation", "Orientation", "") // @TODO Missing documentation
-    , _size("size", "Size", "", 1.f, 0.f, std::pow(10.f, 45)) // @TODO Missing documentation
-    , _segments("segments", "Segments", "", 8, 4, 100) // @TODO Missing documentation
-    , _transparency("transparency", "Transparency", "", 1.f, 0.f, 1.f) // @TODO Missing documentation
+    , _texturePath({ "texture", "Texture", "" }) // @TODO Missing documentation
+    , _orientation({ "orientation", "Orientation", "" }) // @TODO Missing documentation
+    , _size({ "size", "Size", "" }, 1.f, 0.f, std::pow(10.f, 45)) // @TODO Missing documentation
+    , _segments({ "segments", "Segments", "" }, 8, 4, 100) // @TODO Missing documentation
+    , _transparency({ "transparency", "Transparency", "" }, 1.f, 0.f, 1.f) // @TODO Missing documentation
     , _shader(nullptr)
     , _texture(nullptr)
     , _sphere(nullptr)
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 68686c0bed..c7a61525c3 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -133,15 +133,13 @@ documentation::Documentation RenderableTrail::Documentation() {
 
 RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _lineColor("lineColor", "Color", "", glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) // @TODO Missing documentation
-    , _useLineFade("useLineFade", "Use Line Fade", "", true) // @TODO Missing documentation
-    , _lineFade("lineFade", "Line Fade", "", 1.f, 0.f, 20.f) // @TODO Missing documentation
-    , _lineWidth("lineWidth", "Line Width", "", 2.f, 1.f, 20.f) // @TODO Missing documentation
-    , _pointSize("pointSize", "Point Size", "", 1, 1, 64) // @TODO Missing documentation
+    , _lineColor({ "lineColor", "Color", "" }, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) // @TODO Missing documentation
+    , _useLineFade({ "useLineFade", "Use Line Fade", "" }, true) // @TODO Missing documentation
+    , _lineFade({ "lineFade", "Line Fade", "" }, 1.f, 0.f, 20.f) // @TODO Missing documentation
+    , _lineWidth({ "lineWidth", "Line Width", "" }, 2.f, 1.f, 20.f) // @TODO Missing documentation
+    , _pointSize({ "pointSize", "Point Size", "" }, 1, 1, 64) // @TODO Missing documentation
     , _renderingModes(
-        "renderingMode",
-        "Rendering Mode",
-        "", // @TODO Missing documentation
+        { "renderingMode", "Rendering Mode", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
     )
 {
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 450e6243f3..45574e82b4 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -134,8 +134,8 @@ documentation::Documentation RenderableTrailOrbit::Documentation() {
 
 RenderableTrailOrbit::RenderableTrailOrbit(const ghoul::Dictionary& dictionary)
     : RenderableTrail(dictionary)
-    , _period("period", "Period in days", "", 0.0, 0.0, 1e9) // @TODO Missing documentation
-    , _resolution("resolution", "Number of Samples along Orbit", "", 10000, 1, 1000000) // @TODO Missing documentation
+    , _period({ "period", "Period in days", "" }, 0.0, 0.0, 1e9) // @TODO Missing documentation
+    , _resolution({ "resolution", "Number of Samples along Orbit", "" }, 10000, 1, 1000000) // @TODO Missing documentation
     , _needsFullSweep(true)
     , _indexBufferDirty(true)
     , _previousTime(0)
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 28fa60e344..e60c562640 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -125,16 +125,14 @@ documentation::Documentation RenderableTrailTrajectory::Documentation() {
 
 RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& dictionary)
     : RenderableTrail(dictionary)
-    , _startTime("startTime", "Start Time", "") // @TODO Missing documentation
-    , _endTime("endTime", "End Time", "") // @TODO Missing documentation
-    , _sampleInterval("sampleInterval", "Sample Interval", "", 2.0, 2.0, 1e6) // @TODO Missing documentation
+    , _startTime({ "startTime", "Start Time", "" }) // @TODO Missing documentation
+    , _endTime({ "endTime", "End Time", "" }) // @TODO Missing documentation
+    , _sampleInterval({ "sampleInterval", "Sample Interval", "" }, 2.0, 2.0, 1e6) // @TODO Missing documentation
     , _timeStampSubsamplingFactor(
-        "subSample",
-        "Time Stamp Subsampling Factor",
-        "", // @TODO Missing documentation
+        { "subSample", "Time Stamp Subsampling Factor", "" }, // @TODO Missing documentation
         1, 1, 1000000000
     )
-    , _renderFullTrail("renderFullTrail", "Render Full Trail", "", false) // @TODO Missing documentation
+    , _renderFullTrail({ "renderFullTrail", "Render Full Trail", "" }, false) // @TODO Missing documentation
     , _needsFullSweep(true)
     , _subsamplingIsDirty(true)
 {
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 0fe8ad1f6d..7c3ec87af5 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -48,7 +48,7 @@ documentation::Documentation ScreenSpaceFramebuffer::Documentation() {
 
 ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictionary) 
     : ScreenSpaceRenderable(dictionary)
-    , _size("size", "Size", "", glm::vec4(0), glm::vec4(0), glm::vec4(2000)) // @TODO Missing documentation
+    , _size({ "size", "Size", "" }, glm::vec4(0), glm::vec4(0), glm::vec4(2000)) // @TODO Missing documentation
     , _framebuffer(nullptr)
 {
     documentation::testSpecificationAndThrow(
diff --git a/modules/base/rendering/screenspaceimage.cpp b/modules/base/rendering/screenspaceimage.cpp
index 7d81e60faa..f2222559c6 100644
--- a/modules/base/rendering/screenspaceimage.cpp
+++ b/modules/base/rendering/screenspaceimage.cpp
@@ -70,7 +70,7 @@ ScreenSpaceImage::ScreenSpaceImage(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _downloadImage(false)
     , _textureIsDirty(false)
-    , _texturePath("texturePath", "Texture path", "")
+    , _texturePath({ "texturePath", "Texture path", "" }) // @TODO Missing documentation
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 7b852c3f8d..ce78292788 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -61,7 +61,7 @@ documentation::Documentation StaticRotation::Documentation() {
 }
 
 StaticRotation::StaticRotation()
-    : _rotationMatrix("rotation", "Rotation", "", glm::dmat3(1.0)) // @TODO Missing documentation
+    : _rotationMatrix({ "rotation", "Rotation", "" }, glm::dmat3(1.0)) // @TODO Missing documentation
 {}
 
 StaticRotation::StaticRotation(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 97f13ad5f8..dd4807a23f 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -49,7 +49,7 @@ documentation::Documentation StaticScale::Documentation() {
 }
 
 StaticScale::StaticScale()
-    : _scaleValue("scale", "Scale", "", 1.0, 1.0, 1000.0) // @TODO Missing documentation
+    : _scaleValue({ "scale", "Scale", "" }, 1.0, 1.0, 1000.0) // @TODO Missing documentation
 {
     addProperty(_scaleValue);
 }
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index e21b57954c..ec126458bf 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -60,9 +60,7 @@ documentation::Documentation StaticTranslation::Documentation() {
 
 StaticTranslation::StaticTranslation()
     : _position(
-        "position",
-        "Position",
-        "", // @TODO Missing documentation
+        { "position", "Position", "" }, // @TODO Missing documentation
         glm::dvec3(0.0),
         glm::dvec3(-std::numeric_limits<double>::max()),
         glm::dvec3(std::numeric_limits<double>::max())
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index c64bff0c02..2d900914e5 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -47,9 +47,9 @@ namespace openspace {
 
 RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _texture("texture", "Texture", "", -1, -1, 255) // @TODO Missing documentation
-    , _billboard("billboard", "Billboard", "", false) // @TODO Missing documentation
-    , _size("size", "Size", "", 10.f, 0.f, std::pow(10.f, 25.f)) // @TODO Missing documentation
+    , _texture({ "texture", "Texture", "" }, -1, -1, 255) // @TODO Missing documentation
+    , _billboard({ "billboard", "Billboard", "" }, false) // @TODO Missing documentation
+    , _size({ "size", "Size", "" }, 10.f, 0.f, std::pow(10.f, 25.f)) // @TODO Missing documentation
     , _origin(Origin::Center)
     , _shader(nullptr)
     , _quad(0)
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index d4087966dd..79aaec4c14 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -76,18 +76,16 @@ namespace openspace {
 
 RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary) 
     : Renderable(dictionary)
-    , _stepSize("stepSize", "Fieldline Step Size", "", defaultFieldlineStepSize, 0.f, 10.f) // @TODO Missing documentation
-    , _classification("classification", "Fieldline Classification", "", true) // @TODO Missing documentation
+    , _stepSize({ "stepSize", "Fieldline Step Size", "" }, defaultFieldlineStepSize, 0.f, 10.f) // @TODO Missing documentation
+    , _classification({ "classification", "Fieldline Classification", "" }, true) // @TODO Missing documentation
     , _fieldlineColor(
-        "fieldlineColor",
-        "Fieldline Color",
-        "", // @TODO Missing documentation
+        { "fieldlineColor", "Fieldline Color", "" }, // @TODO Missing documentation
         defaultFieldlineColor,
         glm::vec4(0.f),
         glm::vec4(1.f)
       )
-    , _seedPointSource("source", "SeedPoint Source", "") // @TODO Missing documentation
-    , _seedPointSourceFile("sourceFile", "SeedPoint File", "") // @TODO Missing documentation
+    , _seedPointSource({ "source", "SeedPoint Source", "" }) // @TODO Missing documentation
+    , _seedPointSourceFile({ "sourceFile", "SeedPoint File", "" }) // @TODO Missing documentation
     , _program(nullptr)
     , _seedPointsAreDirty(true)
     , _fieldLinesAreDirty(true)
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 9859630ce2..8e8db6b69c 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -57,11 +57,11 @@ namespace openspace {
 
     RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _stepSize("stepSize", "Step Size", "", 0.012, 0.0005, 0.05) // @TODO Missing documentation
-    , _pointStepSize("pointStepSize", "Point Step Size", "", 0.01, 0.01, 0.1) // @TODO Missing documentation
-    , _translation("translation", "Translation", "", glm::vec3(0.0, 0.0, 0.0), glm::vec3(0.0), glm::vec3(10.0)) // @TODO Missing documentation
-    , _rotation("rotation", "Euler rotation", "", glm::vec3(0.0, 0.0, 0.0), glm::vec3(0), glm::vec3(6.28)) // @TODO Missing documentation
-    , _enabledPointsRatio("nEnabledPointsRatio", "Enabled points", "", 0.2, 0, 1) // @TODO Missing documentation
+    , _stepSize({ "stepSize", "Step Size", "" }, 0.012, 0.0005, 0.05) // @TODO Missing documentation
+    , _pointStepSize({ "pointStepSize", "Point Step Size", "" }, 0.01, 0.01, 0.1) // @TODO Missing documentation
+    , _translation({ "translation", "Translation", "" }, glm::vec3(0.0, 0.0, 0.0), glm::vec3(0.0), glm::vec3(10.0)) // @TODO Missing documentation
+    , _rotation({ "rotation", "Euler rotation", "" }, glm::vec3(0.0, 0.0, 0.0), glm::vec3(0), glm::vec3(6.28)) // @TODO Missing documentation
+    , _enabledPointsRatio({ "nEnabledPointsRatio", "Enabled points", "" }, 0.2, 0, 1) // @TODO Missing documentation
 {
     float stepSize;
     glm::vec3 scaling, translation, rotation;
diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp
index ffb57ec918..30d232b58d 100644
--- a/modules/globebrowsing/cache/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp
@@ -45,26 +45,26 @@ MemoryAwareTileCache::MemoryAwareTileCache()
     : PropertyOwner("TileCache")
     , _numTextureBytesAllocatedOnCPU(0)
     , _cpuAllocatedTileData(
-        "cpuAllocatedTileData", "CPU allocated tile data (MB)", "",  // @TODO Missing documentation
+        { "cpuAllocatedTileData", "CPU allocated tile data (MB)", "" },  // @TODO Missing documentation
         1024,   // Default
         128,    // Minimum
         2048,   // Maximum
         1)      // Step: One MB
     , _gpuAllocatedTileData(
-        "gpuAllocatedTileData", "GPU allocated tile data (MB)", "",  // @TODO Missing documentation
+        { "gpuAllocatedTileData", "GPU allocated tile data (MB)", ""},  // @TODO Missing documentation
         1024,   // Default
         128,    // Minimum
         2048,   // Maximum
         1)      // Step: One MB
     , _tileCacheSize(
-        "tileCacheSize", "Tile cache size", "", // @TODO Missing documentation
+        { "tileCacheSize", "Tile cache size", ""}, // @TODO Missing documentation
         1024,   // Default
         128,    // Minimum
         2048,   // Maximum
         1)      // Step: One MB
-    , _applyTileCacheSize("applyTileCacheSize", "Apply tile cache size", "") // @TODO Missing documentation
-    , _clearTileCache("clearTileCache", "Clear tile cache", "") // @TODO Missing documentation
-    , _usePbo("usePbo", "Use PBO", "", false) // @TODO Missing documentation
+    , _applyTileCacheSize({ "applyTileCacheSize", "Apply tile cache size", "" }) // @TODO Missing documentation
+    , _clearTileCache({ "clearTileCache", "Clear tile cache", "" }) // @TODO Missing documentation
+    , _usePbo({ "usePbo", "Use PBO", "" }, false) // @TODO Missing documentation
 {
     createDefaultTextureContainers();
 
diff --git a/modules/globebrowsing/globes/pointglobe.cpp b/modules/globebrowsing/globes/pointglobe.cpp
index 65a3037269..55381f1506 100644
--- a/modules/globebrowsing/globes/pointglobe.cpp
+++ b/modules/globebrowsing/globes/pointglobe.cpp
@@ -38,15 +38,11 @@ namespace openspace::globebrowsing {
 PointGlobe::PointGlobe(const RenderableGlobe& owner)
     : _owner(owner)
     , _intensityClamp(
-        "intensityClamp",
-        "Intensity clamp",
-        "",  // @TODO Missing documentation
+        { "intensityClamp", "Intensity clamp", ""},  // @TODO Missing documentation
         1, 0, 1
     )
     , _lightIntensity(
-        "lightIntensity",
-        "Light intensity",
-        "",  // @TODO Missing documentation
+        { "lightIntensity", "Light intensity", ""},  // @TODO Missing documentation
         1, 0, 50
     )
 {
diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp
index 4ee80cfa88..cae5f33f7a 100644
--- a/modules/globebrowsing/globes/renderableglobe.cpp
+++ b/modules/globebrowsing/globes/renderableglobe.cpp
@@ -42,29 +42,29 @@ namespace openspace::globebrowsing {
 
 RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     : _debugProperties({
-        BoolProperty("saveOrThrowCamera", "save or throw camera", "", false), // @TODO Missing documentation
-        BoolProperty("showChunkEdges", "show chunk edges", "", false), // @TODO Missing documentation
-        BoolProperty("showChunkBounds", "show chunk bounds", "", false), // @TODO Missing documentation
-        BoolProperty("showChunkAABB", "show chunk AABB", "", false), // @TODO Missing documentation
-        BoolProperty("showHeightResolution", "show height resolution", "", false), // @TODO Missing documentation
-        BoolProperty("showHeightIntensities", "show height intensities", "", false), // @TODO Missing documentation
-        BoolProperty("performFrustumCulling", "perform frustum culling", "", true), // @TODO Missing documentation
-        BoolProperty("performHorizonCulling", "perform horizon culling", "", true), // @TODO Missing documentation
-        BoolProperty("levelByProjectedAreaElseDistance", "level by projected area (else distance)", "", true), // @TODO Missing documentation
-        BoolProperty("resetTileProviders", "reset tile providers", "", false), // @TODO Missing documentation
-        BoolProperty("toggleEnabledEveryFrame", "toggle enabled every frame", "", false), // @TODO Missing documentation
-        BoolProperty("collectStats", "collect stats", "", false), // @TODO Missing documentation
-        BoolProperty("limitLevelByAvailableData", "Limit level by available data", "", true), // @TODO Missing documentation
-        IntProperty("modelSpaceRenderingCutoffLevel", "Model Space Rendering Cutoff Level", "", 10, 1, 22) // @TODO Missing documentation
+        BoolProperty({ "saveOrThrowCamera", "save or throw camera", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "showChunkEdges", "show chunk edges", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "showChunkBounds", "show chunk bounds", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "showChunkAABB", "show chunk AABB", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "showHeightResolution", "show height resolution", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "showHeightIntensities", "show height intensities", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "performFrustumCulling", "perform frustum culling", "" }, true), // @TODO Missing documentation
+        BoolProperty({ "performHorizonCulling", "perform horizon culling", "" }, true), // @TODO Missing documentation
+        BoolProperty({ "levelByProjectedAreaElseDistance", "level by projected area (else distance)", "" }, true), // @TODO Missing documentation
+        BoolProperty({ "resetTileProviders", "reset tile providers", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "toggleEnabledEveryFrame", "toggle enabled every frame", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "collectStats", "collect stats", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "limitLevelByAvailableData", "Limit level by available data", "" }, true), // @TODO Missing documentation
+        IntProperty({ "modelSpaceRenderingCutoffLevel", "Model Space Rendering Cutoff Level", "" }, 10, 1, 22) // @TODO Missing documentation
     })
     , _generalProperties({
-        BoolProperty("enabled", "Enabled", "", true), // @TODO Missing documentation
-        BoolProperty("performShading", "perform shading", "", true), // @TODO Missing documentation
-        BoolProperty("atmosphere", "atmosphere", "", false), // @TODO Missing documentation
-        BoolProperty("useAccurateNormals", "useAccurateNormals", "", false), // @TODO Missing documentation
-        FloatProperty("lodScaleFactor", "lodScaleFactor", "", 10.0f, 1.0f, 50.0f), // @TODO Missing documentation
-        FloatProperty("cameraMinHeight", "cameraMinHeight", "", 100.0f, 0.0f, 1000.0f), // @TODO Missing documentation
-        FloatProperty("orenNayarRoughness", "orenNayarRoughness", "", 0.0f, 0.0f, 1.0f) // @TODO Missing documentation
+        BoolProperty({ "enabled", "Enabled", "" }, true), // @TODO Missing documentation
+        BoolProperty({ "performShading", "perform shading", "" }, true), // @TODO Missing documentation
+        BoolProperty({ "atmosphere", "atmosphere", "" }, false), // @TODO Missing documentation
+        BoolProperty({ "useAccurateNormals", "useAccurateNormals", "" }, false), // @TODO Missing documentation
+        FloatProperty({ "lodScaleFactor", "lodScaleFactor", "" }, 10.0f, 1.0f, 50.0f), // @TODO Missing documentation
+        FloatProperty({ "cameraMinHeight", "cameraMinHeight", "" }, 100.0f, 0.0f, 1000.0f), // @TODO Missing documentation
+        FloatProperty({ "orenNayarRoughness", "orenNayarRoughness", "" }, 0.0f, 0.0f, 1.0f) // @TODO Missing documentation
     })
     , _debugPropertyOwner("Debug")
 {
diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp
index dbf4239580..b3ead7fcaa 100644
--- a/modules/globebrowsing/rendering/layer/layer.cpp
+++ b/modules/globebrowsing/rendering/layer/layer.cpp
@@ -42,28 +42,23 @@ namespace {
 Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict)
     : properties::PropertyOwner(layerDict.value<std::string>(keyName))
     , _typeOption(
-        "type",
-        "Type",
-        "", // @TODO Missing documentation
+        { "type", "Type", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
     )
     , _blendModeOption(
-        "blendMode",
-        "Blend Mode",
-        "", // @TODO Missing documentation
+        { "blendMode", "Blend Mode", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
     )
-    , _enabled(properties::BoolProperty("enabled", "Enabled", "", false)) // @TODO Missing documentation
-    , _reset("reset", "Reset", "") // @TODO Missing documentation
+    , _enabled({ "enabled", "Enabled", "" }, false) // @TODO Missing documentation
+    , _reset({ "reset", "Reset", "" }) // @TODO Missing documentation
     , _tileProvider(nullptr)
     , _otherTypesProperties{
         properties::Vec3Property (
-        "color",
-        "Color",
-        "", // @TODO Missing documentation
+        { "color", "Color", "" }, // @TODO Missing documentation
         glm::vec4(1.f, 1.f, 1.f, 1.f),
         glm::vec4(0.f),
-        glm::vec4(1.f))
+        glm::vec4(1.f)
+        )
     }
     , _layerGroupId(id)
 {
diff --git a/modules/globebrowsing/rendering/layer/layeradjustment.cpp b/modules/globebrowsing/rendering/layer/layeradjustment.cpp
index b763c21a4b..6711f4bb51 100644
--- a/modules/globebrowsing/rendering/layer/layeradjustment.cpp
+++ b/modules/globebrowsing/rendering/layer/layeradjustment.cpp
@@ -35,25 +35,19 @@ namespace openspace::globebrowsing {
 LayerAdjustment::LayerAdjustment()
     : properties::PropertyOwner("adjustment")
     , chromaKeyColor(
-        "chromaKeyColor",
-        "Chroma key color",
-        "", // @TODO Missing documentation
+        { "chromaKeyColor", "Chroma key color", "" }, // @TODO Missing documentation
         glm::vec3(0.f, 0.f, 0.f),
         glm::vec3(0.f),
         glm::vec3(1.f)
       )
     , chromaKeyTolerance(
-        "chromaKeyTolerance",
-        "Chroma key tolerance",
-        "", // @TODO Missing documentation
+        { "chromaKeyTolerance", "Chroma key tolerance", "" }, // @TODO Missing documentation
         0,
         0,
         1
       )
     , _typeOption(
-        "type",
-        "Type",
-        "", // @TODO Missing documentation
+        { "type", "Type", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
       )
     , _onChangeCallback([](){})
diff --git a/modules/globebrowsing/rendering/layer/layergroup.cpp b/modules/globebrowsing/rendering/layer/layergroup.cpp
index cb97b32217..4b915ed6da 100644
--- a/modules/globebrowsing/rendering/layer/layergroup.cpp
+++ b/modules/globebrowsing/rendering/layer/layergroup.cpp
@@ -35,7 +35,7 @@ namespace openspace::globebrowsing {
 LayerGroup::LayerGroup(layergroupid::GroupID id)
     : properties::PropertyOwner(std::move(layergroupid::LAYER_GROUP_NAMES[id]))
     , _groupId(id)
-    , _levelBlendingEnabled("blendTileLevels", "blend tile levels", false)
+    , _levelBlendingEnabled({ "blendTileLevels", "blend tile levels", "" }, false) // @TODO Missing documentation
 {
     addProperty(_levelBlendingEnabled);
 }
diff --git a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
index a3e2e9fd3a..12736a7806 100644
--- a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
+++ b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
@@ -36,12 +36,12 @@ namespace openspace::globebrowsing {
 
 LayerRenderSettings::LayerRenderSettings()
     : properties::PropertyOwner("Settings")
-    , setDefault("setDefault", "Set Default", "") // @TODO Missing documentation
-    , opacity(properties::FloatProperty("opacity", "Opacity", "", 1.f, 0.f, 1.f)) // @TODO Missing documentation
-    , gamma(properties::FloatProperty("gamma", "Gamma", "", 1, 0, 5))// @TODO Missing documentation
-    , multiplier(properties::FloatProperty("multiplier", "Multiplier", "", 1.f, 0.f, 20.f))// @TODO Missing documentation
-    , offset(properties::FloatProperty("offset", "Offset", "", 0.f, -10000.f, 10000.f))// @TODO Missing documentation
-    , valueBlending(properties::FloatProperty("valueBlending", "Value Blending", "", // @TODO Missing documentation
+    , setDefault({ "setDefault", "Set Default", "" }) // @TODO Missing documentation
+    , opacity(properties::FloatProperty({ "opacity", "Opacity", "" }, 1.f, 0.f, 1.f)) // @TODO Missing documentation
+    , gamma(properties::FloatProperty({ "gamma", "Gamma", "" }, 1, 0, 5))// @TODO Missing documentation
+    , multiplier(properties::FloatProperty({ "multiplier", "Multiplier", "" }, 1.f, 0.f, 20.f))// @TODO Missing documentation
+    , offset(properties::FloatProperty({ "offset", "Offset", "" }, 0.f, -10000.f, 10000.f))// @TODO Missing documentation
+    , valueBlending(properties::FloatProperty({ "valueBlending", "Value Blending", "" }, // @TODO Missing documentation
                                                1.f, 0.f, 1.f))
     , useValueBlending(false)
 {
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
index c19215f1db..4d45166380 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
@@ -88,9 +88,9 @@ bool GdalWrapper::logGdalErrors() const {
 GdalWrapper::GdalWrapper(size_t maximumCacheSize,
                          size_t maximumMaximumCacheSize)
     : PropertyOwner("GdalWrapper")
-    , _logGdalErrors("logGdalErrors", "Log GDAL errors", "", true) // @TODO Missing documentation
+    , _logGdalErrors({ "logGdalErrors", "Log GDAL errors", "" }, true) // @TODO Missing documentation
     , _gdalMaximumCacheSize (
-        "gdalMaximumCacheSize", "GDAL maximum cache size", "", // @TODO Missing documentation
+        { "gdalMaximumCacheSize", "GDAL maximum cache size", "" }, // @TODO Missing documentation
         maximumCacheSize / (1024 * 1024),           // Default
         0,                                          // Minimum: No caching
         maximumMaximumCacheSize / (1024 * 1024),    // Maximum
diff --git a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp
index 2386deef2f..db888fd9e7 100644
--- a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp
@@ -55,8 +55,8 @@ namespace openspace::globebrowsing::tileprovider {
     
 DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary) 
     : TileProvider(dictionary)
-    , _filePath("filePath", "File Path", "", "") // @TODO Missing documentation
-    , _tilePixelSize("tilePixelSize", "Tile Pixel Size", "", 32, 32, 1024) // @TODO Missing documentation
+    , _filePath({ "filePath", "File Path", "" }, "") // @TODO Missing documentation
+    , _tilePixelSize({ "tilePixelSize", "Tile Pixel Size", "" }, 32, 32, 1024) // @TODO Missing documentation
     , _preCacheLevel(0)
 {
     _tileCache = OsEng.moduleEngine().module<GlobeBrowsingModule>()->tileCache();
@@ -108,12 +108,11 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
 DefaultTileProvider::DefaultTileProvider(
     std::shared_ptr<AsyncTileDataProvider> tileReader)
     : _asyncTextureDataProvider(tileReader)
-    , _filePath("filePath", "File Path", "", "") // @TODO Missing documentation
-    , _tilePixelSize("tilePixelSize", "Tile Pixel Size", "", 32, 32, 1024) // @TODO Missing documentation
-{ }
+    , _filePath({ "filePath", "File Path", "" }, "") // @TODO Missing documentation
+    , _tilePixelSize({ "tilePixelSize", "Tile Pixel Size", "" }, 32, 32, 1024) // @TODO Missing documentation
+{}
 
-DefaultTileProvider::~DefaultTileProvider()
-{ }
+DefaultTileProvider::~DefaultTileProvider() {}
 
 void DefaultTileProvider::update() {
     if (_asyncTextureDataProvider) {
diff --git a/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp b/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp
index acbbfbdbb0..10d52fb0ab 100644
--- a/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp
@@ -36,7 +36,7 @@ namespace openspace::globebrowsing::tileprovider {
     
 SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary)
     : _tile(nullptr, nullptr, Tile::Status::Unavailable)
-    , _filePath("filePath", "File Path", "")
+    , _filePath({ "filePath", "File Path", "" }) // @TODO Missing documentation
 {
     // Required input
     std::string filePath;
@@ -50,7 +50,7 @@ SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary)
 
 SingleImageProvider::SingleImageProvider(const std::string& imagePath)
     : _tile(nullptr, nullptr, Tile::Status::Unavailable)
-    , _filePath("filePath", "File Path", imagePath)
+    , _filePath({ "filePath", "File Path", "" }, imagePath) // @TODO Missing documentation
 {
     reset();
 }
diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
index c0086553cc..eeeea69dc3 100644
--- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
@@ -56,7 +56,7 @@ const char* TemporalTileProvider::TemporalXMLTags::TIME_FORMAT = "OpenSpaceTimeI
 
 TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary) 
     : _initDict(dictionary)
-    , _filePath("filePath", "File Path", "")
+    , _filePath({ "filePath", "File Path", "" }, "") // @TODO Missing documentation
     , _successfulInitialization(false)
 {
     std::string filePath;
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 65fc8f928f..8c3945e7e8 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -41,13 +41,13 @@ namespace openspace {
 DataCygnet::DataCygnet(const ghoul::Dictionary& dictionary)
     : IswaCygnet(dictionary)
     , _dataProcessor(nullptr)
-    , _dataOptions("dataOptions", "Data Options", "") // @TODO Missing documentation
-    , _useLog("useLog","Use Logarithm", "", false) // @TODO Missing documentation
-    , _useHistogram("useHistogram", "Auto Contrast", "", false) // @TODO Missing documentation
-    , _autoFilter("autoFilter", "Auto Filter", "", true) // @TODO Missing documentation
-    , _normValues("normValues", "Normalize Values", "", glm::vec2(1.0,1.0), glm::vec2(0), glm::vec2(5.0)) // @TODO Missing documentation
-    , _backgroundValues("backgroundValues", "Background Values", "", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) // @TODO Missing documentation
-    , _transferFunctionsFile("transferfunctions", "Transfer Functions", "", "${SCENE}/iswa/tfs/default.tf") // @TODO Missing documentation
+    , _dataOptions({ "dataOptions", "Data Options", "" }) // @TODO Missing documentation
+    , _useLog({ "useLog","Use Logarithm", "" }, false) // @TODO Missing documentation
+    , _useHistogram({ "useHistogram", "Auto Contrast", "" }, false) // @TODO Missing documentation
+    , _autoFilter({ "autoFilter", "Auto Filter", "" }, true) // @TODO Missing documentation
+    , _normValues({ "normValues", "Normalize Values", "" }, glm::vec2(1.0, 1.0), glm::vec2(0), glm::vec2(5.0)) // @TODO Missing documentation
+    , _backgroundValues({ "backgroundValues", "Background Values", "" }, glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) // @TODO Missing documentation
+    , _transferFunctionsFile({ "transferfunctions", "Transfer Functions", "" }, "${SCENE}/iswa/tfs/default.tf") // @TODO Missing documentation
     //FOR TESTING
     , _numOfBenchmarks(0)
     , _avgBenchmarkTime(0.0f)
diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp
index 84b4dbf0d1..52c02a29a5 100644
--- a/modules/iswa/rendering/iswabasegroup.cpp
+++ b/modules/iswa/rendering/iswabasegroup.cpp
@@ -44,9 +44,9 @@ namespace openspace {
 
 IswaBaseGroup::IswaBaseGroup(std::string name, std::string type)
     : properties::PropertyOwner(std::move(name))
-    , _enabled("enabled", "Enabled", "", true) // @TODO Missing documentation
-    , _alpha("alpha", "Alpha", "", 0.9f, 0.0f, 1.0f) // @TODO Missing documentation
-    , _delete("delete", "Delete", "") // @TODO Missing documentation
+    , _enabled({ "enabled", "Enabled", "" }, true) // @TODO Missing documentation
+    , _alpha({ "alpha", "Alpha", "" }, 0.9f, 0.0f, 1.0f) // @TODO Missing documentation
+    , _delete({ "delete", "Delete", "" }) // @TODO Missing documentation
     , _registered(false)
     , _type(type)
     , _dataProcessor(nullptr)
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 2e39253013..7004ac220b 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -41,8 +41,8 @@ namespace openspace {
 
 IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _delete("delete", "Delete", "") // @TODO Missing documentation
-    , _alpha("alpha", "Alpha", "", 0.9f, 0.0f, 1.0f) // @TODO Missing documentation
+    , _delete({ "delete", "Delete", "" }) // @TODO Missing documentation
+    , _alpha({ "alpha", "Alpha", "" }, 0.9f, 0.0f, 1.0f) // @TODO Missing documentation
     , _shader(nullptr)
     , _group(nullptr)
     , _textureDirty(false)
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index 8546e0221c..3ce6401508 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -43,13 +43,13 @@ namespace {
 namespace openspace{
 IswaDataGroup::IswaDataGroup(std::string name, std::string type)
     : IswaBaseGroup(name, type)    
-    , _useLog("useLog","Use Logarithm", "", false) // @TODO Missing documentation
-    , _useHistogram("useHistogram", "Auto Contrast", "", false) // @TODO Missing documentation
-    , _autoFilter("autoFilter", "Auto Filter", "", true) // @TODO Missing documentation
-    , _normValues("normValues", "Normalize Values", "", glm::vec2(1.0, 1.0), glm::vec2(0), glm::vec2(5.0)) // @TODO Missing documentation
-    , _backgroundValues("backgroundValues", "Background Values", "", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) // @TODO Missing documentation
-    , _transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/default.tf", "") // @TODO Missing documentation
-    , _dataOptions("dataOptions", "Data Options", "") // @TODO Missing documentation
+    , _useLog({ "useLog","Use Logarithm", "" }, false) // @TODO Missing documentation
+    , _useHistogram({ "useHistogram", "Auto Contrast", "" }, false) // @TODO Missing documentation
+    , _autoFilter({ "autoFilter", "Auto Filter", "" }, true) // @TODO Missing documentation
+    , _normValues({ "normValues", "Normalize Values", "" }, glm::vec2(1.0, 1.0), glm::vec2(0), glm::vec2(5.0)) // @TODO Missing documentation
+    , _backgroundValues({ "backgroundValues", "Background Values", "" }, glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) // @TODO Missing documentation
+    , _transferFunctionsFile({ "transferfunctions", "Transfer Functions", "" }, "${SCENE}/iswa/tfs/default.tf") // @TODO Missing documentation
+    , _dataOptions({ "dataOptions", "Data Options", "" }) // @TODO Missing documentation
 {
     addProperty(_useLog);
     addProperty(_useHistogram);
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 3030cb1e90..a29a76bb9a 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -43,8 +43,8 @@ namespace {
 namespace openspace{
 IswaKameleonGroup::IswaKameleonGroup(std::string name, std::string type)
     : IswaDataGroup(name, type)
-    , _resolution("resolution", "Resolution%", "", 100.0f, 10.0f, 200.0f) // @TODO Missing documentation
-    , _fieldlines("fieldlineSeedsIndexFile", "Fieldline Seedpoints", "") // @TODO Missing documentation
+    , _resolution({ "resolution", "Resolution%", "" }, 100.0f, 10.0f, 200.0f) // @TODO Missing documentation
+    , _fieldlines({ "fieldlineSeedsIndexFile", "Fieldline Seedpoints", "" }) // @TODO Missing documentation
     , _fieldlineIndexFile("")
     , _kameleonPath("")
 {
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index db7ce81888..3008e61619 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -39,9 +39,9 @@ namespace openspace {
 
 KameleonPlane::KameleonPlane(const ghoul::Dictionary& dictionary)
     : DataCygnet(dictionary)
-    , _fieldlines("fieldlineSeedsIndexFile", "Fieldline Seedpoints", "") // @TODO Missing documentation
-    , _resolution("resolution", "Resolution%", "", 100.0f, 10.0f, 200.0f) // @TODO Missing documentation
-    , _slice("slice", "Slice", "", 0.0, 0.0, 1.0) // @TODO Missing documentation
+    , _fieldlines({ "fieldlineSeedsIndexFile", "Fieldline Seedpoints", "" }) // @TODO Missing documentation
+    , _resolution({ "resolution", "Resolution%", "" }, 100.0f, 10.0f, 200.0f) // @TODO Missing documentation
+    , _slice({ "slice", "Slice", "" }, 0.0, 0.0, 1.0) // @TODO Missing documentation
 {
     addProperty(_resolution);
     addProperty(_slice);
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index cce9d4a2c6..c8735878c9 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -64,24 +64,24 @@ namespace openspace {
 
 RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _dimensions("dimensions", "Dimensions", "") // @TODO Missing documentation
-    , _variable("variable", "Variable", "")  // @TODO Missing documentation
-    , _lowerDomainBound("lowerDomainBound", "Lower Domain Bound", "") // @TODO Missing documentation
-    , _upperDomainBound("upperDomainBound", "Upper Domain Bound", "") // @TODO Missing documentation
-    , _domainScale("domainScale", "Domain scale", "") // @TODO Missing documentation
+    , _dimensions({ "dimensions", "Dimensions", "" }) // @TODO Missing documentation
+    , _variable({ "variable", "Variable", "" })  // @TODO Missing documentation
+    , _lowerDomainBound({ "lowerDomainBound", "Lower Domain Bound", "" }) // @TODO Missing documentation
+    , _upperDomainBound({ "upperDomainBound", "Upper Domain Bound", "" }) // @TODO Missing documentation
+    , _domainScale({ "domainScale", "Domain scale", "" }) // @TODO Missing documentation
     , _autoDomainBounds(false)
-    , _lowerValueBound("lowerValueBound", "Lower Value Bound", "", 0.f, 0.f, 1.f) // @TODO Missing documentation
-    , _upperValueBound("upperValueBound", "Upper Value Bound", "", 1.f, 0.01f, 1.f) // @TODO Missing documentation
+    , _lowerValueBound({ "lowerValueBound", "Lower Value Bound", "" }, 0.f, 0.f, 1.f) // @TODO Missing documentation
+    , _upperValueBound({ "upperValueBound", "Upper Value Bound", "" }, 1.f, 0.01f, 1.f) // @TODO Missing documentation
     , _autoValueBounds(false)
-    , _gridType("gridType", "Grid Type", "", properties::OptionProperty::DisplayType::Dropdown) // @TODO Missing documentation
+    , _gridType({ "gridType", "Grid Type", "" }, properties::OptionProperty::DisplayType::Dropdown) // @TODO Missing documentation
     , _autoGridType(false)
     , _clipPlanes(nullptr)
-    , _stepSize("stepSize", "Step Size", "", 0.02f, 0.01f, 1.f) // @TODO Missing documentation
-    , _sourcePath("sourcePath", "Source Path", "") // @TODO Missing documentation
-    , _transferFunctionPath("transferFunctionPath", "Transfer Function Path", "") // @TODO Missing documentation
+    , _stepSize({ "stepSize", "Step Size", "" }, 0.02f, 0.01f, 1.f) // @TODO Missing documentation
+    , _sourcePath({ "sourcePath", "Source Path", "" }) // @TODO Missing documentation
+    , _transferFunctionPath({ "transferFunctionPath", "Transfer Function Path", "" }) // @TODO Missing documentation
     , _raycaster(nullptr)
     , _transferFunction(nullptr)
-    , _cache("cache", "Cache", "") // @TODO Missing documentation
+    , _cache({ "cache", "Cache", "" }) // @TODO Missing documentation
 {
 
     glm::vec3 dimensions;
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index be9514e5db..7f3910268d 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -95,20 +95,20 @@ RenderableMultiresVolume::RenderableMultiresVolume (const ghoul::Dictionary& dic
     , _errorHistogramManager(nullptr)
     , _histogramManager(nullptr)
     , _localErrorHistogramManager(nullptr)
-    , _stepSizeCoefficient("stepSizeCoefficient", "Stepsize Coefficient", "", 1.f, 0.01f, 10.f) // @TODO Missing documentation
-    , _currentTime("currentTime", "Current Time", "", 0, 0, 0) // @TODO Missing documentation
-    , _memoryBudget("memoryBudget", "Memory Budget", "", 0, 0, 0) // @TODO Missing documentation
-    , _streamingBudget("streamingBudget", "Streaming Budget", "", 0, 0, 0) // @TODO Missing documentation
-    , _useGlobalTime("useGlobalTime", "Global Time", "", false) // @TODO Missing documentation
-    , _loop("loop", "Loop", "", false) // @TODO Missing documentation
-    , _selectorName("selector", "Brick Selector", "") // @TODO Missing documentation
+    , _stepSizeCoefficient({ "stepSizeCoefficient", "Stepsize Coefficient", "" }, 1.f, 0.01f, 10.f) // @TODO Missing documentation
+    , _currentTime({ "currentTime", "Current Time", "" }, 0, 0, 0) // @TODO Missing documentation
+    , _memoryBudget({ "memoryBudget", "Memory Budget", "" }, 0, 0, 0) // @TODO Missing documentation
+    , _streamingBudget({ "streamingBudget", "Streaming Budget", "" }, 0, 0, 0) // @TODO Missing documentation
+    , _useGlobalTime({ "useGlobalTime", "Global Time", "" }, false) // @TODO Missing documentation
+    , _loop({ "loop", "Loop", "" }, false) // @TODO Missing documentation
+    , _selectorName({ "selector", "Brick Selector", "" }) // @TODO Missing documentation
     , _gatheringStats(false)
-    , _statsToFile("printStats", "Print Stats", "", false) // @TODO Missing documentation
-    , _statsToFileName("printStatsFileName", "Stats Filename", "") // @TODO Missing documentation
-    , _scalingExponent("scalingExponent", "Scaling Exponent", "", 1, -10, 20) // @TODO Missing documentation
-    , _scaling("scaling", "Scaling", "", glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
-    , _translation("translation", "Translation", "", glm::vec3(0.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
-    , _rotation("rotation", "Euler rotation", "", glm::vec3(0.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(6.28f)) // @TODO Missing documentation
+    , _statsToFile({ "printStats", "Print Stats", "" }, false) // @TODO Missing documentation
+    , _statsToFileName({ "printStatsFileName", "Stats Filename", "" }) // @TODO Missing documentation
+    , _scalingExponent({ "scalingExponent", "Scaling Exponent", "" }, 1, -10, 20) // @TODO Missing documentation
+    , _scaling({ "scaling", "Scaling", "" }, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
+    , _translation({ "translation", "Translation", "" }, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
+    , _rotation({ "rotation", "Euler rotation", "" }, glm::vec3(0.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(6.28f)) // @TODO Missing documentation
 {
     std::string name;
     //bool success = dictionary.getValue(constants::scenegraphnode::keyName, name);
@@ -349,9 +349,9 @@ bool RenderableMultiresVolume::initialize() {
     unsigned int maxInitialBudget = 2048;
     int initialBudget = std::min(maxInitialBudget, maxNumBricks);
 
-    _currentTime = properties::IntProperty("currentTime", "Current Time", "", 0, 0, _tsp->header().numTimesteps_ - 1); // @TODO Missing documentation
-    _memoryBudget = properties::IntProperty("memoryBudget", "Memory Budget", "", initialBudget, 0, maxNumBricks); // @TODO Missing documentation
-    _streamingBudget = properties::IntProperty("streamingBudget", "Streaming Budget", "", initialBudget, 0, maxNumBricks); // @TODO Missing documentation
+    _currentTime = properties::IntProperty({ "currentTime", "Current Time", "" }, 0, 0, _tsp->header().numTimesteps_ - 1); // @TODO Missing documentation
+    _memoryBudget = properties::IntProperty({ "memoryBudget", "Memory Budget", "" }, initialBudget, 0, maxNumBricks); // @TODO Missing documentation
+    _streamingBudget = properties::IntProperty({ "streamingBudget", "Streaming Budget", "" }, initialBudget, 0, maxNumBricks); // @TODO Missing documentation
     addProperty(_currentTime);
     addProperty(_memoryBudget);
     addProperty(_streamingBudget);
diff --git a/modules/newhorizons/rendering/renderablefov.cpp b/modules/newhorizons/rendering/renderablefov.cpp
index 325f4c0569..9d1b569fa3 100644
--- a/modules/newhorizons/rendering/renderablefov.cpp
+++ b/modules/newhorizons/rendering/renderablefov.cpp
@@ -129,52 +129,38 @@ documentation::Documentation RenderableFov::Documentation() {
 
 RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _lineWidth("lineWidth", "Line Width", "", 1.f, 1.f, 20.f) // @TODO Missing documentation
-    , _drawSolid("solidDraw", "Draw as Quads", "", false) // @TODO Missing documentation
-    , _standOffDistance("standOffDistance", "Standoff Distance", "", 0.9999, 0.99, 1.0, 0.000001) // @TODO Missing documentation
+    , _lineWidth({ "lineWidth", "Line Width", "" }, 1.f, 1.f, 20.f) // @TODO Missing documentation
+    , _drawSolid({ "solidDraw", "Draw as Quads", "" }, false) // @TODO Missing documentation
+    , _standOffDistance({ "standOffDistance", "Standoff Distance", "" }, 0.9999, 0.99, 1.0, 0.000001) // @TODO Missing documentation
     , _programObject(nullptr)
     , _drawFOV(false)
     , _colors({
         {
-            "colors.defaultStart",
-            "Start of default color",
-            "", // @TODO Missing documentation
+            { "colors.defaultStart", "Start of default color", "" }, // @TODO Missing documentation
             glm::vec4(0.4f)
         },
         {
-            "colors.defaultEnd",
-            "End of default color",
-            "", // @TODO Missing documentation
+            { "colors.defaultEnd", "End of default color", "" },  // @TODO Missing documentation
             glm::vec4(0.85f, 0.85f, 0.85f, 1.f)
         },
         {
-            "colors.active",
-            "Active Color",
-            "", // @TODO Missing documentation
+            { "colors.active", "Active Color", "" }, // @TODO Missing documentation
             glm::vec4(0.f, 1.f, 0.f, 1.f)
         },
         {
-            "colors.targetInFieldOfView",
-            "Target-in-field-of-view Color",
-            "", // @TODO Missing documentation
+            { "colors.targetInFieldOfView", "Target-in-field-of-view Color", "" }, // @TODO Missing documentation
             glm::vec4(0.f, 0.5f, 0.7f, 1.f)
         },
         {
-            "colors.intersectionStart",
-            "Start of the intersection",
-            "", // @TODO Missing documentation
+            { "colors.intersectionStart", "Start of the intersection", "" }, // @TODO Missing documentation
             glm::vec4(1.f, 0.89f, 0.f, 1.f)
         },
         {
-            "colors.intersectionEnd",
-            "End of the intersection",
-            "", // @TODO Missing documentation
+            { "colors.intersectionEnd", "End of the intersection", "" }, // @TODO Missing documentation
             glm::vec4(1.f, 0.29f, 0.f, 1.f)
         },
         {
-            "colors.square",
-            "Orthogonal Square",
-            "", // @TODO Missing documentation
+            { "colors.square", "Orthogonal Square", "" }, // @TODO Missing documentation
             glm::vec4(0.85f, 0.85f, 0.85f, 1.f)
         }
     })
diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp
index 34440944a3..73953bd118 100644
--- a/modules/newhorizons/rendering/renderablemodelprojection.cpp
+++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp
@@ -104,13 +104,13 @@ documentation::Documentation RenderableModelProjection::Documentation() {
 
 RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _colorTexturePath("colorTexture", "Color Texture", "") // @TODO Missing documentation
-    , _rotation("rotation", "Rotation", "", glm::vec3(0.f), glm::vec3(0.f), glm::vec3(360.f)) // @TODO Missing documentation
+    , _colorTexturePath({ "colorTexture", "Color Texture", "" }) // @TODO Missing documentation
+    , _rotation({ "rotation", "Rotation", "" }, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(360.f)) // @TODO Missing documentation
     , _programObject(nullptr)
     , _fboProgramObject(nullptr)
     , _baseTexture(nullptr)
     , _geometry(nullptr)
-    , _performShading("performShading", "Perform Shading", "", true) // @TODO Missing documentation
+    , _performShading({ "performShading", "Perform Shading", "" }, true) // @TODO Missing documentation
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp
index 1caed1166a..67922bcde2 100644
--- a/modules/newhorizons/rendering/renderableplanetprojection.cpp
+++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp
@@ -121,16 +121,16 @@ documentation::Documentation RenderablePlanetProjection::Documentation() {
 
 RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _colorTexturePath("planetTexture", "RGB Texture", "") // @TODO Missing documentation
-    , _heightMapTexturePath("heightMap", "Heightmap Texture", "") // @TODO Missing documentation
-    , _rotation("rotation", "Rotation", "", 0, 0, 360) // @TODO Missing documentation
+    , _colorTexturePath({ "planetTexture", "RGB Texture", "" }) // @TODO Missing documentation
+    , _heightMapTexturePath({ "heightMap", "Heightmap Texture", "" }) // @TODO Missing documentation
+    , _rotation({ "rotation", "Rotation", "" }, 0, 0, 360) // @TODO Missing documentation
     , _programObject(nullptr)
     , _fboProgramObject(nullptr)
     , _baseTexture(nullptr)
     , _heightMapTexture(nullptr)
-    , _shiftMeridianBy180("shiftMeiridian", "Shift Meridian by 180 deg", "", false) // @TODO Missing documentation
-    , _heightExaggeration("heightExaggeration", "Height Exaggeration", "", 1.f, 0.f, 100.f) // @TODO Missing documentation
-    , _debugProjectionTextureRotation("debug.projectionTextureRotation", "Projection Texture Rotation", "", 0.f, 0.f, 360.f) // @TODO Missing documentation
+    , _shiftMeridianBy180({ "shiftMeiridian", "Shift Meridian by 180 deg", "" }, false) // @TODO Missing documentation
+    , _heightExaggeration({ "heightExaggeration", "Height Exaggeration", "" }, 1.f, 0.f, 100.f) // @TODO Missing documentation
+    , _debugProjectionTextureRotation({ "debug.projectionTextureRotation", "Projection Texture Rotation", "" }, 0.f, 0.f, 360.f) // @TODO Missing documentation
     , _capture(false)
 {
     documentation::testSpecificationAndThrow(
diff --git a/modules/newhorizons/rendering/renderableshadowcylinder.cpp b/modules/newhorizons/rendering/renderableshadowcylinder.cpp
index 39c641a258..c4555346fb 100644
--- a/modules/newhorizons/rendering/renderableshadowcylinder.cpp
+++ b/modules/newhorizons/rendering/renderableshadowcylinder.cpp
@@ -46,9 +46,9 @@ namespace openspace {
 
 RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _numberOfPoints("amountOfPoints", "Points", "", 190, 1, 300) // @TODO Missing documentation
-    , _shadowLength("shadowLength", "Shadow Length", "", 0.1f, 0.0f, 0.5f) // @TODO Missing documentation
-    , _shadowColor("shadowColor", "Shadow Color", "", // @TODO Missing documentation
+    , _numberOfPoints({ "amountOfPoints", "Points", "" }, 190, 1, 300) // @TODO Missing documentation
+    , _shadowLength({ "shadowLength", "Shadow Length", "" }, 0.1f, 0.0f, 0.5f) // @TODO Missing documentation
+    , _shadowColor({ "shadowColor", "Shadow Color", "" }, // @TODO Missing documentation
                    glm::vec4(1.f, 1.f, 1.f, 0.25f), glm::vec4(0.f), glm::vec4(1.f))
     , _shader(nullptr)
     , _vao(0)
diff --git a/modules/newhorizons/util/projectioncomponent.cpp b/modules/newhorizons/util/projectioncomponent.cpp
index d67c2307df..d58ba518a0 100644
--- a/modules/newhorizons/util/projectioncomponent.cpp
+++ b/modules/newhorizons/util/projectioncomponent.cpp
@@ -168,11 +168,11 @@ documentation::Documentation ProjectionComponent::Documentation() {
 
 ProjectionComponent::ProjectionComponent()
     : properties::PropertyOwner("ProjectionComponent")
-    , _performProjection("performProjection", "Perform Projections", "", true) // @TODO Missing documentation
-    , _clearAllProjections("clearAllProjections", "Clear Projections", "", false) // @TODO Missing documentation
-    , _projectionFading("projectionFading", "Projection Fading", "", 1.f, 0.f, 1.f) // @TODO Missing documentation
-    , _textureSize("textureSize", "Texture Size", "", ivec2(16), ivec2(16), ivec2(32768)) // @TODO Missing documentation
-    , _applyTextureSize("applyTextureSize", "Apply Texture Size", "") // @TODO Missing documentation
+    , _performProjection({ "performProjection", "Perform Projections", "" }, true) // @TODO Missing documentation
+    , _clearAllProjections({ "clearAllProjections", "Clear Projections", "" }, false) // @TODO Missing documentation
+    , _projectionFading({ "projectionFading", "Projection Fading", "" }, 1.f, 0.f, 1.f) // @TODO Missing documentation
+    , _textureSize({ "textureSize", "Texture Size", "" }, ivec2(16), ivec2(16), ivec2(32768)) // @TODO Missing documentation
+    , _applyTextureSize({ "applyTextureSize", "Apply Texture Size", "" }) // @TODO Missing documentation
     , _textureSizeDirty(false)
     , _projectionTexture(nullptr)
 {
diff --git a/modules/onscreengui/src/guicomponent.cpp b/modules/onscreengui/src/guicomponent.cpp
index 3a3e845015..e2bcbd2afb 100644
--- a/modules/onscreengui/src/guicomponent.cpp
+++ b/modules/onscreengui/src/guicomponent.cpp
@@ -28,7 +28,7 @@ namespace openspace::gui {
 
 GuiComponent::GuiComponent(std::string name)
     : properties::PropertyOwner(std::move(name))
-    , _isEnabled("enabled", "Is Enabled", "", false) // @TODO Missing documentation
+    , _isEnabled({ "enabled", "Is Enabled", "" }, false) // @TODO Missing documentation
 {
     addProperty(_isEnabled);
 }
diff --git a/modules/onscreengui/src/guiperformancecomponent.cpp b/modules/onscreengui/src/guiperformancecomponent.cpp
index dfe7ce7986..19d4d357b0 100644
--- a/modules/onscreengui/src/guiperformancecomponent.cpp
+++ b/modules/onscreengui/src/guiperformancecomponent.cpp
@@ -55,10 +55,10 @@ namespace openspace::gui {
 
 GuiPerformanceComponent::GuiPerformanceComponent()
     : GuiComponent("PerformanceComponent")
-    , _sortingSelection("sortingSelection", "Sorting", "", -1, -1, 6) // @TODO Missing documentation
-    , _sceneGraphIsEnabled("showSceneGraph", "Show Scene Graph Measurements", "", false) // @TODO Missing documentation
-    , _functionsIsEnabled("showFunctions", "Show Function Measurements", "", false) // @TODO Missing documentation
-    , _outputLogs("outputLogs", "Output Logs", "", false) // @TODO Missing documentation
+    , _sortingSelection({ "sortingSelection", "Sorting", "" }, -1, -1, 6) // @TODO Missing documentation
+    , _sceneGraphIsEnabled({ "showSceneGraph", "Show Scene Graph Measurements", "" }, false) // @TODO Missing documentation
+    , _functionsIsEnabled({ "showFunctions", "Show Function Measurements", "" }, false) // @TODO Missing documentation
+    , _outputLogs({ "outputLogs", "Output Logs", "" }, false) // @TODO Missing documentation
 {
     addProperty(_sortingSelection);
 
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 1ce2c7d462..75f01a9827 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -90,8 +90,8 @@ RenderableConstellationBounds::RenderableConstellationBounds(
     : Renderable(dictionary)
     , _vertexFilename("")
     , _constellationFilename("")
-    , _distance("distance", "Distance to the celestial Sphere", "", 15.f, 0.f, 30.f) // @TODO Missing documentation
-    , _constellationSelection("constellationSelection", "Constellation Selection", "") // @TODO Missing documentation
+    , _distance({ "distance", "Distance to the celestial Sphere", "" }, 15.f, 0.f, 30.f) // @TODO Missing documentation
+    , _constellationSelection({ "constellationSelection", "Constellation Selection", "" }) // @TODO Missing documentation
     , _vao(0)
     , _vbo(0)
 {
diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp
index 2239026e3d..11eb07bc2c 100644
--- a/modules/space/rendering/renderableplanet.cpp
+++ b/modules/space/rendering/renderableplanet.cpp
@@ -121,15 +121,15 @@ documentation::Documentation RenderablePlanet::Documentation() {
 
 RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _colorTexturePath("colorTexture", "Color Texture", "") // @TODO Missing documentation
-    , _nightTexturePath("nightTexture", "Night Texture", "") // @TODO Missing documentation
-    , _heightMapTexturePath("heightMap", "Heightmap Texture", "") // @TODO Missing documentation
+    , _colorTexturePath({ "colorTexture", "Color Texture", "" }) // @TODO Missing documentation
+    , _nightTexturePath({ "nightTexture", "Night Texture", "" }) // @TODO Missing documentation
+    , _heightMapTexturePath({ "heightMap", "Heightmap Texture", "" }) // @TODO Missing documentation
     , _programObject(nullptr)
     , _texture(nullptr)
     , _nightTexture(nullptr)
-    , _heightExaggeration("heightExaggeration", "Height Exaggeration", "", 1.f, 0.f, 10.f) // @TODO Missing documentation
+    , _heightExaggeration({ "heightExaggeration", "Height Exaggeration", "" }, 1.f, 0.f, 10.f) // @TODO Missing documentation
     , _geometry(nullptr)
-    , _performShading("performShading", "Perform Shading", "", true) // @TODO Missing documentation
+    , _performShading({ "performShading", "Perform Shading", "" }, true) // @TODO Missing documentation
     , _alpha(1.f)
     , _planetRadius(0.f)
     , _hasNightTexture(false)
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 7a5ab1f73e..1e9bc0b33c 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -85,11 +85,11 @@ documentation::Documentation RenderableRings::Documentation() {
 
 RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _texturePath("texture", "Texture", "") // @TODO Missing documentation
-    , _size("size", "Size", "", 1.f, 0.f, std::pow(1.f, 25.f)) // @TODO Missing documentation
-    , _offset("offset", "Offset", "", glm::vec2(0, 1.f), glm::vec2(0.f), glm::vec2(1.f)) // @TODO Missing documentation
-    , _nightFactor("nightFactor", "Night Factor", "", 0.33f, 0.f, 1.f) // @TODO Missing documentation
-    , _transparency("transparency", "Transparency", "", 0.15f, 0.f, 1.f) // @TODO Missing documentation
+    , _texturePath({ "texture", "Texture", "" }) // @TODO Missing documentation
+    , _size({ "size", "Size", "" }, 1.f, 0.f, std::pow(1.f, 25.f)) // @TODO Missing documentation
+    , _offset({ "offset", "Offset", "" }, glm::vec2(0, 1.f), glm::vec2(0.f), glm::vec2(1.f)) // @TODO Missing documentation
+    , _nightFactor({ "nightFactor", "Night Factor", "" }, 0.33f, 0.f, 1.f) // @TODO Missing documentation
+    , _transparency({ "transparency", "Transparency", "" }, 0.15f, 0.f, 1.f) // @TODO Missing documentation
     , _shader(nullptr)
     , _texture(nullptr)
     , _textureFile(nullptr)
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index ecfcf0bb09..ebdd77e719 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -125,22 +125,20 @@ documentation::Documentation RenderableStars::Documentation() {
 
 RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _pointSpreadFunctionTexturePath("psfTexture", "Point Spread Function Texture", "") // @TODO Missing documentation
+    , _pointSpreadFunctionTexturePath({ "psfTexture", "Point Spread Function Texture", "" }) // @TODO Missing documentation
     , _pointSpreadFunctionTexture(nullptr)
     , _pointSpreadFunctionTextureIsDirty(true)
-    , _colorTexturePath("colorTexture", "ColorBV Texture", "") // @TODO Missing documentation
+    , _colorTexturePath({ "colorTexture", "ColorBV Texture", "" }) // @TODO Missing documentation
     , _colorTexture(nullptr)
     , _colorTextureIsDirty(true)
     , _colorOption(
-        "colorOption",
-        "Color Option",
-        "", // @TODO Missing documentation
+        { "colorOption", "Color Option", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
     )
     , _dataIsDirty(true)
-    , _alphaValue("alphaValue", "Transparency", "", 1.f, 0.f, 1.f) // @TODO Missing documentation
-    , _scaleFactor("scaleFactor", "Scale Factor", "", 1.f, 0.f, 10.f) // @TODO Missing documentation
-    , _minBillboardSize("minBillboardSize", "Min Billboard Size", "", 1.f, 1.f, 100.f) // @TODO Missing documentation
+    , _alphaValue({ "alphaValue", "Transparency", "" }, 1.f, 0.f, 1.f) // @TODO Missing documentation
+    , _scaleFactor({ "scaleFactor", "Scale Factor", "" }, 1.f, 0.f, 10.f) // @TODO Missing documentation
+    , _minBillboardSize({ "minBillboardSize", "Min Billboard Size", "" }, 1.f, 1.f, 100.f) // @TODO Missing documentation
     , _program(nullptr)
     , _speckFile("")
     , _nValuesPerStar(0)
diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp
index 0ff0e03a12..f090b76b7f 100644
--- a/modules/space/rendering/simplespheregeometry.cpp
+++ b/modules/space/rendering/simplespheregeometry.cpp
@@ -39,13 +39,11 @@ namespace openspace::planetgeometry {
 SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
     : PlanetGeometry()
     , _radius(
-        "radius",
-        "Radius",
-        "", // @TODO Missing documentation
+        { "radius", "Radius", "" }, // @TODO Missing documentation
         glm::vec3(1.f, 1.f, 1.f),
         glm::vec3(0.f, 0.f, 0.f),
         glm::vec3(std::pow(10.f, 20.f), std::pow(10.f, 20.f), std::pow(10.f, 20.f)))
-    , _segments("segments", "Segments", "", 20, 1, 5000) // @TODO Missing documentation
+    , _segments({ "segments", "Segments", "" }, 20, 1, 5000) // @TODO Missing documentation
     , _sphere(nullptr)
 {
     float sphereRadius = 0.f;
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index bc8cfcce52..ed7cf6826b 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -83,8 +83,8 @@ documentation::Documentation SpiceRotation::Documentation() {
 }
 
 SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
-    : _sourceFrame("source", "Source", "")
-    , _destinationFrame("destination", "Destination", "")
+    : _sourceFrame({ "source", "Source", "" }) // @TODO Missing documentation
+    , _destinationFrame({ "destination", "Destination", "" }) // @TODO Missing documentation
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 340352f193..60fb8432bc 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -142,28 +142,24 @@ documentation::Documentation KeplerTranslation::Documentation() {
 
 KeplerTranslation::KeplerTranslation()
     : Translation()
-    , _eccentricity("eccentricity", "Eccentricity", "", 0.0, 0.0, 1.0) // @TODO Missing documentation
-    , _semiMajorAxis("semimajorAxis", "Semi-major axis", "", 0.0, 0.0, 1e6) // @TODO Missing documentation
-    , _inclination("inclination", "Inclination", "", 0.0, 0.0, 360.0) // @TODO Missing documentation
+    , _eccentricity({ "eccentricity", "Eccentricity", "" }, 0.0, 0.0, 1.0) // @TODO Missing documentation
+    , _semiMajorAxis({ "semimajorAxis", "Semi-major axis", "" }, 0.0, 0.0, 1e6) // @TODO Missing documentation
+    , _inclination({ "inclination", "Inclination", "" }, 0.0, 0.0, 360.0) // @TODO Missing documentation
     , _ascendingNode(
-        "ascendingNode",
-        "Right ascension of ascending Node",
-        "", // @TODO Missing documentation
+        { "ascendingNode", "Right ascension of ascending Node", "" }, // @TODO Missing documentation
         0.0,
         0.0,
         360.0
     )
     , _argumentOfPeriapsis(
-        "argumentOfPeriapsis",
-        "Argument of Periapsis",
-        "", // @TODO Missing documentation
+        { "argumentOfPeriapsis", "Argument of Periapsis", "" }, // @TODO Missing documentation
         0.0,
         0.0,
         360.0
     )
-    , _meanAnomalyAtEpoch("meanAnomalyAtEpoch", "Mean anomaly at epoch", "", 0.0, 0.0, 360.0) // @TODO Missing documentation
-    , _epoch("epoch", "Epoch", "", 0.0, 0.0, 1e9) // @TODO Missing documentation
-    , _period("period", "Orbit period", "", 0.0, 0.0, 1e6) // @TODO Missing documentation
+    , _meanAnomalyAtEpoch({ "meanAnomalyAtEpoch", "Mean anomaly at epoch", "" }, 0.0, 0.0, 360.0) // @TODO Missing documentation
+    , _epoch({ "epoch", "Epoch", "" }, 0.0, 0.0, 1e9) // @TODO Missing documentation
+    , _period({ "period", "Orbit period", "" }, 0.0, 0.0, 1e6) // @TODO Missing documentation
     , _orbitPlaneDirty(true)
 {
     auto update = [this]() {
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 3171c2c6c3..54e928b484 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -99,9 +99,9 @@ documentation::Documentation SpiceTranslation::Documentation() {
 }
 
 SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
-    : _target("target", "Target", "longlong test asdkl;asd;klas\nasdklasdkl;asl;d") // @TODO Missing documentation
-    , _origin("origin", "Origin", "") // @TODO Missing documentation
-    , _frame("frame", "Reference Frame", "", DefaultReferenceFrame) // @TODO Missing documentation
+    : _target({ "target", "Target", "" }) // @TODO Missing documentation
+    , _origin({ "origin", "Origin", "" }) // @TODO Missing documentation
+    , _frame({ "frame", "Reference Frame", "" }, DefaultReferenceFrame) // @TODO Missing documentation
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 6b3a5ece08..72c6617d80 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -74,134 +74,99 @@ namespace openspace {
 
 TouchInteraction::TouchInteraction()
     : properties::PropertyOwner("TouchInteraction")
-    , _origin("origin", "Origin", "") // @TODO Missing documentation
+    , _origin({ "origin", "Origin", "" }) // @TODO Missing documentation
     , _unitTest(
-        "Click to take a unit test",
-        "Take a unit test saving the LM data into file",
-        "", // @TODO Missing documentation
+        { "Click to take a unit test", "Take a unit test saving the LM data into file", "" }, // @TODO Missing documentation
         false
     )
     , _touchActive(
-        "TouchEvents",
-        "True if we have a touch event",
-        "", // @TODO Missing documentation
-        false,
-        properties::Property::Visibility::Hidden
+        { "TouchEvents", "True if we have a touch event", "",  properties::Property::Visibility::Hidden }, // @TODO Missing documentation
+        false
     )
     , _reset(
-        "Default Values",
-        "Reset all properties to default",
-        "", // @TODO Missing documentation
+        { "Default Values", "Reset all properties to default", "" }, // @TODO Missing documentation
         false
     )
     , _maxTapTime(
-        "Max Tap Time",
-        "Max tap delay (in ms) for double tap",
-        "", // @TODO Missing documentation
+        { "Max Tap Time", "Max tap delay (in ms) for double tap", "" }, // @TODO Missing documentation
         300,
         10,
         1000
     )
     , _deceleratesPerSecond(
-        "Decelerates per second",
-        "Number of times velocity is decelerated per second",
-        "", // @TODO Missing documentation
+        { "Decelerates per second", "Number of times velocity is decelerated per second", "" }, // @TODO Missing documentation
         240,
         60,
         300
     )
     , _touchScreenSize(
-        "TouchScreenSize",
-        "Touch Screen size in inches",
-        "", // @TODO Missing documentation
+        { "TouchScreenSize", "Touch Screen size in inches", "" }, // @TODO Missing documentation
         55.0f,
         5.5f,
         150.0f
     )
     , _tapZoomFactor(
-        "Tap zoom factor",
-        "Scaling distance travelled on tap",
-        "", // @TODO Missing documentation
+        { "Tap zoom factor", "Scaling distance travelled on tap", "" }, // @TODO Missing documentation
         0.2f,
         0.f,
         0.5f
     )
     , _nodeRadiusThreshold(
-        "Activate direct-manipulation",
-        "Radius a planet has to have to activate direct-manipulation",
-        "", // @TODO Missing documentation
+        { "Activate direct-manipulation", "Radius a planet has to have to activate direct-manipulation", "" }, // @TODO Missing documentation
         0.2f,
         0.0f,
         1.0f
     )
     , _rollAngleThreshold(
-        "Interpret roll",
-        "Threshold for min angle for roll interpret",
-        "", // @TODO Missing documentation
+        { "Interpret roll", "Threshold for min angle for roll interpret", "" }, // @TODO Missing documentation
         0.025f,
         0.f,
         0.05f
     )
     , _orbitSpeedThreshold(
-        "Activate orbit spinning",
-        "Threshold to activate orbit spinning in direct-manipulation",
-        "", // @TODO Missing documentation
+        { "Activate orbit spinning", "Threshold to activate orbit spinning in direct-manipulation", "" }, // @TODO Missing documentation
         0.005f,
         0.f,
         0.01f
     )
     , _spinSensitivity(
-        "Sensitivity of spinning",
-        "Sensitivity of spinning in direct-manipulation",
-        "", // @TODO Missing documentation
+        { "Sensitivity of spinning", "Sensitivity of spinning in direct-manipulation", "" }, // @TODO Missing documentation
         1.f,
         0.f,
         2.f
     )
     , _inputStillThreshold(
-        "Input still",
-        "Threshold for interpreting input as still",
-        "", // @TODO Missing documentation
+        { "Input still", "Threshold for interpreting input as still", "" }, // @TODO Missing documentation
         0.0005f,
         0.f,
         0.001f
     )
     , _centroidStillThreshold(
-        "Centroid stationary",
-        "Threshold for stationary centroid",
-        "", // @TODO Missing documentation
+        { "Centroid stationary", "Threshold for stationary centroid", "" }, // @TODO Missing documentation
         0.0018f,
         0.f,
         0.01f
     ) // used to void wrongly interpreted roll interactions
     , _interpretPan(
-        "Pan delta distance",
-        "Delta distance between fingers allowed for interpreting pan interaction",
-        "", // @TODO Missing documentation
+        { "Pan delta distance", "Delta distance between fingers allowed for interpreting pan interaction", "" }, // @TODO Missing documentation
         0.015f,
         0.f,
         0.1f
     )
     , _slerpTime(
-        "Time to slerp",
-        "Time to slerp in seconds to new orientation with new node picking",
-        "", // @TODO Missing documentation
+        { "Time to slerp", "Time to slerp in seconds to new orientation with new node picking", "" }, // @TODO Missing documentation
         3.f,
         0.f,
         5.f
     )
     , _guiButton(
-        "GUI Button",
-        "GUI button size in pixels",
-        "", // @TODO Missing documentation
+        { "GUI Button", "GUI button size in pixels", "" }, // @TODO Missing documentation
         glm::ivec2(32, 64),
         glm::ivec2(8, 16),
         glm::ivec2(128, 256)
     )
     , _friction(
-        "Friction",
-        "Friction for different interactions (orbit, zoom, roll, pan)",
-        "", // @TODO Missing documentation
+        { "Friction", "Friction for different interactions (orbit, zoom, roll, pan)", "" }, // @TODO Missing documentation
         glm::vec4(0.01f, 0.025f, 0.02f, 0.02f),
         glm::vec4(0.f),
         glm::vec4(0.2f)
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index f94018117e..05b6439ee7 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -39,14 +39,12 @@ namespace openspace {
 
 TouchMarker::TouchMarker()
     : properties::PropertyOwner("TouchMarker")
-    , _visible("TouchMarkers visible", "Toggle visibility of markers", "", true) // @TODO Missing documentation
-    , _radiusSize("Marker size", "Marker radius", "", 30.f, 0.f, 100.f) // @TODO Missing documentation
-    , _transparency("Transparency of marker", "Marker transparency", "", 0.8f, 0.f, 1.f) // @TODO Missing documentation
-    , _thickness("Thickness of marker", "Marker thickness", "", 2.f, 0.f, 4.f) // @TODO Missing documentation
+    , _visible({ "TouchMarkers visible", "Toggle visibility of markers", "" }, true) // @TODO Missing documentation
+    , _radiusSize({ "Marker size", "Marker radius", "" }, 30.f, 0.f, 100.f) // @TODO Missing documentation
+    , _transparency({ "Transparency of marker", "Marker transparency", "" }, 0.8f, 0.f, 1.f) // @TODO Missing documentation
+    , _thickness({ "Thickness of marker", "Marker thickness", "" }, 2.f, 0.f, 4.f) // @TODO Missing documentation
     , _color(
-        "MarkerColor",
-        "Marker color",
-        "", // @TODO Missing documentation
+        { "MarkerColor", "Marker color", "" }, // @TODO Missing documentation
         glm::vec3(204.f / 255.f, 51.f / 255.f, 51.f / 255.f),
         glm::vec3(0.f),
         glm::vec3(1.f)
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index 1a8f223f6d..103b243293 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -37,12 +37,12 @@ namespace openspace {
 
 RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _scalingExponent("scalingExponent", "Scaling Exponent", "", 1, -10, 20)
-    , _stepSize("stepSize", "Step Size", "", 0.02f, 0.01f, 1.f) // @TODO Missing documentation
-    , _scaling("scaling", "Scaling", "", glm::vec3(1.f, 1.f, 1.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
-    , _translation("translation", "Translation", "", glm::vec3(0.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
-    , _rotation("rotation", "Euler rotation", "", glm::vec3(0.f, 0.f, 0.f), glm::vec3(0), glm::vec3(6.28f)) // @TODO Missing documentation
-    , _color("color", "Color", "", glm::vec4(1.f, 0.f, 0.f, 0.1f), glm::vec4(0.f), glm::vec4(1.f)) // @TODO Missing documentation
+    , _scalingExponent({ "scalingExponent", "Scaling Exponent", "" }, 1, -10, 20)
+    , _stepSize({ "stepSize", "Step Size", "" }, 0.02f, 0.01f, 1.f) // @TODO Missing documentation
+    , _scaling({ "scaling", "Scaling", "" }, glm::vec3(1.f, 1.f, 1.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
+    , _translation({ "translation", "Translation", "" }, glm::vec3(0.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(10.f)) // @TODO Missing documentation
+    , _rotation({ "rotation", "Euler rotation", "" }, glm::vec3(0.f, 0.f, 0.f), glm::vec3(0), glm::vec3(6.28f)) // @TODO Missing documentation
+    , _color({ "color", "Color", "" }, glm::vec4(1.f, 0.f, 0.f, 0.1f), glm::vec4(0.f), glm::vec4(1.f)) // @TODO Missing documentation
 {
     float stepSize;
     int scalingExponent;
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 6498eb0dbe..0ae65b6c21 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -31,17 +31,13 @@ namespace openspace {
 
 VolumeClipPlane::VolumeClipPlane(const ghoul::Dictionary& dictionary)
     : _normal(
-        "normal",
-        "Normal",
-        "", // @TODO Missing documentation
+        { "normal", "Normal", "" }, // @TODO Missing documentation
         glm::vec3(1.f, 0.f, 0.f),
         glm::vec3(-1.f),
         glm::vec3(1.f)
     )
     , _offsets(
-        "offsets",
-        "Offsets",
-        "", // @TODO Missing documentation
+        { "offsets", "Offsets", "" }, // @TODO Missing documentation
         glm::vec2(-2.f, 0.f),
         glm::vec2(-2.f, 0.f),
         glm::vec2(2.f, 1.f)
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 5d1a9e8d74..a093262b9d 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -30,7 +30,7 @@
 namespace openspace {
 
 VolumeClipPlanes::VolumeClipPlanes(const ghoul::Dictionary& dictionary)
-    : _nClipPlanes("nClipPlanes", "Number of clip planes", "", 0, 0, 10) // @TODO Missing documentation
+    : _nClipPlanes({ "nClipPlanes", "Number of clip planes", "" }, 0, 0, 10) // @TODO Missing documentation
 {
     std::vector<std::string> keys = dictionary.keys();
     for (const std::string& key : keys) {
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index a5dda2323c..527543f3df 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -78,9 +78,7 @@ int addVirtualProperty(lua_State* L) {
     if (type == "BoolProperty") {
         bool v = lua_toboolean(L, -3);
         prop = std::make_unique<properties::BoolProperty>(
-            identifier,
-            name,
-            description,
+            properties::Property::PropertyInfo{ identifier, name, description },
             v
         );
     }
@@ -90,9 +88,7 @@ int addVirtualProperty(lua_State* L) {
         int max = static_cast<int>(lua_tonumber(L, -1));
 
         prop = std::make_unique<properties::IntProperty>(
-            identifier,
-            name,
-            description,
+            properties::Property::PropertyInfo{ identifier, name, description },
             v,
             min,
             max
@@ -104,9 +100,7 @@ int addVirtualProperty(lua_State* L) {
         float max = static_cast<float>(lua_tonumber(L, -1));
 
         prop = std::make_unique<properties::FloatProperty>(
-            identifier,
-            name,
-            description,
+            properties::Property::PropertyInfo{ identifier, name, description },
             v,
             min,
             max
@@ -114,9 +108,7 @@ int addVirtualProperty(lua_State* L) {
     }
     else if (type == "TriggerProperty") {
         prop = std::make_unique<properties::TriggerProperty>(
-            identifier,
-            name,
-            description
+            properties::Property::PropertyInfo{ identifier, name, description }
         );
     }
     else {
diff --git a/src/engine/settingsengine.cpp b/src/engine/settingsengine.cpp
index a4da6d755d..b058fcba0d 100644
--- a/src/engine/settingsengine.cpp
+++ b/src/engine/settingsengine.cpp
@@ -42,11 +42,11 @@ namespace openspace {
 
 SettingsEngine::SettingsEngine()
     : properties::PropertyOwner("Global Properties")
-    , _scenes("scenes", "Scene", "", properties::OptionProperty::DisplayType::Dropdown) // @TODO Missing documentation
-    , _busyWaitForDecode("busyWaitForDecode", "Busy Wait for decode", "", false) // @TODO Missing documentation
-    , _logSGCTOutOfOrderErrors("logSGCTOutOfOrderErrors", "Log SGCT out-of-order", "", false) // @TODO Missing documentation
-    , _useDoubleBuffering("useDoubleBuffering", "Use double buffering", "", false) // @TODO Missing documentation
-    , _spiceUseExceptions("enableSpiceExceptions", "Enable Spice Exceptions", "", false) // @TODO Missing documentation
+    , _scenes({ "scenes", "Scene", "" }, properties::OptionProperty::DisplayType::Dropdown) // @TODO Missing documentation
+    , _busyWaitForDecode({ "busyWaitForDecode", "Busy Wait for decode", "" }, false) // @TODO Missing documentation
+    , _logSGCTOutOfOrderErrors({ "logSGCTOutOfOrderErrors", "Log SGCT out-of-order", "" }, false) // @TODO Missing documentation
+    , _useDoubleBuffering({ "useDoubleBuffering", "Use double buffering", "" }, false) // @TODO Missing documentation
+    , _spiceUseExceptions({ "enableSpiceExceptions", "Enable Spice Exceptions", "" }, false) // @TODO Missing documentation
 {
     _spiceUseExceptions.onChange([this] {
         SpiceManager::ref().setExceptionHandling(
diff --git a/src/engine/wrapper/sgctwindowwrapper.cpp b/src/engine/wrapper/sgctwindowwrapper.cpp
index 758e7bbf9f..36ecd58d84 100644
--- a/src/engine/wrapper/sgctwindowwrapper.cpp
+++ b/src/engine/wrapper/sgctwindowwrapper.cpp
@@ -36,8 +36,8 @@ namespace {
 namespace openspace {
 
 SGCTWindowWrapper::SGCTWindowWrapper()
-    : _eyeSeparation("eyeSeparation", "Eye Separation", "", 0.f, 0.f, 10.f) // @TODO Missing documentation
-    , _showStatsGraph("showStatsGraph", "Show Stats Graph", "", false) // @TODO Missing documentation
+    : _eyeSeparation({ "eyeSeparation", "Eye Separation", "" }, 0.f, 0.f, 10.f) // @TODO Missing documentation
+    , _showStatsGraph({ "showStatsGraph", "Show Stats Graph", "" }, false) // @TODO Missing documentation
 {
     _showStatsGraph.onChange([this](){
         sgct::Engine::instance()->setStatsGraphVisibility(_showStatsGraph);
diff --git a/src/interaction/luaconsole.cpp b/src/interaction/luaconsole.cpp
index 57c5ff7030..ccf87326b6 100644
--- a/src/interaction/luaconsole.cpp
+++ b/src/interaction/luaconsole.cpp
@@ -75,49 +75,39 @@ namespace openspace {
 
 LuaConsole::LuaConsole()
     : properties::PropertyOwner("LuaConsole")
-    , _isVisible("isVisible", "Is Visible", "", false) // @TODO Missing documentation
-    , _remoteScripting("remoteScripting", "Remote scripting", "", false) // @TODO Missing documentation
+    , _isVisible({ "isVisible", "Is Visible", "" }, false) // @TODO Missing documentation
+    , _remoteScripting({ "remoteScripting", "Remote scripting", "" }, false) // @TODO Missing documentation
     , _backgroundColor(
-        "backgroundColor",
-        "Background Color",
-        "", // @TODO Missing documentation
+        { "backgroundColor", "Background Color", "" }, // @TODO Missing documentation
         glm::vec4(21.f / 255.f, 23.f / 255.f, 28.f / 255.f, 0.8f),
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
     , _highlightColor(
-        "highlightColor",
-        "Highlight Color",
-        "", // @TODO Missing documentation
+        { "highlightColor", "Highlight Color", "" }, // @TODO Missing documentation
         glm::vec4(1.f, 1.f, 1.f, 0.f),
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
     , _separatorColor(
-        "separatorColor",
-        "Separator Color",
-        "", // @TODO Missing documentation
+        { "separatorColor", "Separator Color", "" }, // @TODO Missing documentation
         glm::vec4(0.4f, 0.4f, 0.4f, 0.f),
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
     , _entryTextColor(
-        "entryTextColor",
-        "Entry Text Color",
-        "", // @TODO Missing documentation
+        { "entryTextColor", "Entry Text Color", "" }, // @TODO Missing documentation
         glm::vec4(1.f, 1.f, 1.f, 1.f),
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
     , _historyTextColor(
-        "historyTextColor",
-        "History Text Color",
-        "", // @TODO Missing documentation
+        { "historyTextColor", "History Text Color", "" }, // @TODO Missing documentation
         glm::vec4(1.0f, 1.0f, 1.0f, 0.65f),
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
-    , _historyLength("historyLength", "History Length", "", 13, 0, 100) // @TODO Missing documentation
+    , _historyLength({ "historyLength", "History Length", "" }, 13, 0, 100) // @TODO Missing documentation
     , _inputPosition(0)
     , _activeCommand(0)
     , _autoCompleteInfo({NoAutoComplete, false, ""})
diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index b7fc5bdcde..5fec81b06e 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -54,8 +54,8 @@ namespace openspace::interaction {
 
 NavigationHandler::NavigationHandler()
     : properties::PropertyOwner("NavigationHandler")
-    , _origin("origin", "Origin", "")
-    , _useKeyFrameInteraction("useKeyFrameInteraction", "Use keyframe interaction", "", false) // @TODO Missing documentation
+    , _origin({ "origin", "Origin", "" }) // @TODO Missing documentation
+    , _useKeyFrameInteraction({ "useKeyFrameInteraction", "Use keyframe interaction", "" }, false) // @TODO Missing documentation
 {
     _origin.onChange([this]() {
         SceneGraphNode* node = sceneGraphNode(_origin.value());
diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp
index e1c5fc45c2..693750ff1c 100644
--- a/src/interaction/orbitalnavigator.cpp
+++ b/src/interaction/orbitalnavigator.cpp
@@ -41,15 +41,18 @@ namespace openspace::interaction {
 
 OrbitalNavigator::OrbitalNavigator()
     : properties::PropertyOwner("OrbitalNavigator")
-    , _rotationalFriction("rotationalFriction", "Rotational friction", "", true) // @TODO Missing documentation
-    , _horizontalFriction("horizontalFriction", "Horizontal friction", "", true) // @TODO Missing documentation
-    , _verticalFriction("verticalFriction", "Vertical friction", "", true) // @TODO Missing documentation
-    , _followFocusNodeRotationDistance("followFocusNodeRotationDistance",
-        "Follow focus node rotation distance", "", 2.0f, 0.0f, 10.f) // @TODO Missing documentation
-    , _minimumAllowedDistance("minimumAllowedDistance",
-        "Minimum allowed distance", "", 10.0f, 0.0f, 10000.f) // @TODO Missing documentation
-    , _sensitivity("sensitivity", "Sensitivity", "", 20.0f, 1.0f, 50.f) // @TODO Missing documentation
-    , _motionLag("motionLag", "Motion lag", "", 0.5f, 0.f, 1.f) // @TODO Missing documentation
+    , _rotationalFriction({ "rotationalFriction", "Rotational friction", "" }, true) // @TODO Missing documentation
+    , _horizontalFriction({ "horizontalFriction", "Horizontal friction", "" }, true) // @TODO Missing documentation
+    , _verticalFriction({ "verticalFriction", "Vertical friction", "" }, true) // @TODO Missing documentation
+    , _followFocusNodeRotationDistance(
+        { "followFocusNodeRotationDistance", "Follow focus node rotation distance", "" }, // @TODO Missing documentation
+        2.0f, 0.0f, 10.f
+    )
+    , _minimumAllowedDistance(
+        {"minimumAllowedDistance", "Minimum allowed distance", "" }, // @TODO Missing documentation
+        10.0f, 0.0f, 10000.f)
+    , _sensitivity({ "sensitivity", "Sensitivity", "" }, 20.0f, 1.0f, 50.f) // @TODO Missing documentation
+    , _motionLag({ "motionLag", "Motion lag", "" }, 0.5f, 0.f, 1.f) // @TODO Missing documentation
     , _mouseStates(_sensitivity * pow(10.0,-4), 1 / (_motionLag + 0.0000001))
 {
     auto smoothStep = 
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 99f3c7b05c..c080cfb44c 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -87,29 +87,25 @@ namespace openspace {
 
 ParallelConnection::ParallelConnection()
     : properties::PropertyOwner("ParallelConnection")
-    , _password("password", "Password", "") // @TODO Missing documentation
-    , _hostPassword("hostPassword", "Host Password", "") // @TODO Missing documentation
-    , _port("port", "Port", "20501", "") // @TODO Missing documentation
-    , _address("address", "Address", "localhost", "") // @TODO Missing documentation
-    , _name("name", "Connection name", "Anonymous", "") // @TODO Missing documentation
-    , _bufferTime("bufferTime", "Buffer Time", "", 1, 0.5, 10) // @TODO Missing documentation
+    , _password({ "password", "Password", "" }) // @TODO Missing documentation
+    , _hostPassword({ "hostPassword", "Host Password", "" }) // @TODO Missing documentation
+    , _port({ "port", "Port", "" }, "20501") // @TODO Missing documentation
+    , _address({ "address", "Address", "" }, "localhost") // @TODO Missing documentation
+    , _name({ "name", "Connection name", "" }, "Anonymous") // @TODO Missing documentation
+    , _bufferTime({ "bufferTime", "Buffer Time", "" }, 1, 0.5, 10) // @TODO Missing documentation
     , _timeKeyframeInterval(
-        "timeKeyframeInterval",
-        "Time keyframe interval",
-        "", // @TODO Missing documentation
+        { "timeKeyframeInterval", "Time keyframe interval", ""}, // @TODO Missing documentation
         0.1f,
         0.f,
         1.f
     )
     , _cameraKeyframeInterval(
-        "cameraKeyframeInterval",
-        "Camera Keyframe interval",
-        "", // @TODO Missing documentation
+        { "cameraKeyframeInterval", "Camera Keyframe interval", "" }, // @TODO Missing documentation
         0.1f,
         0.f,
         1.f
     )
-    , _timeTolerance("timeTolerance", "Time tolerance", "", 1.f, 0.5f, 5.f) // @TODO Missing documentation
+    , _timeTolerance({ "timeTolerance", "Time tolerance", "" }, 1.f, 0.5f, 5.f) // @TODO Missing documentation
     , _lastTimeKeyframeTimestamp(0)
     , _lastCameraKeyframeTimestamp(0)
     , _clientSocket(INVALID_SOCKET)
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index a28aad52c6..d7092f5d30 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -32,16 +32,13 @@ namespace openspace::properties {
     
 const std::string OptionProperty::OptionsKey = "Options";
 
-OptionProperty::OptionProperty(std::string identifier, std::string guiName,
-                               std::string desc, Property::Visibility visibility)
-    : IntProperty(std::move(identifier), std::move(guiName), std::move(desc), visibility)
+OptionProperty::OptionProperty(PropertyInfo info)
+    : IntProperty(std::move(info))
     , _displayType(DisplayType::Radio)
 {}
 
-OptionProperty::OptionProperty(std::string identifier, std::string guiName,
-                               std::string desc, DisplayType displayType,
-                               Property::Visibility visibility)
-    : IntProperty(std::move(identifier), std::move(guiName), std::move(desc), visibility)
+OptionProperty::OptionProperty(PropertyInfo info, DisplayType displayType)
+    : IntProperty(std::move(info))
     , _displayType(displayType)
 {}
 
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 218387611f..2f6e41a51b 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -30,8 +30,9 @@
 
 #include <algorithm>
 
+#include <ghoul/logging/logmanager.h>
+
 namespace {
-    const char* MetaDataKeyGuiName = "guiName";
     const char* MetaDataKeyGroup = "Group";
     const char* MetaDataKeyVisibility = "Visibility";
     const char* MetaDataKeyReadOnly = "isReadOnly";
@@ -52,18 +53,24 @@ const char* Property::NameKey = "Name";
 const char* Property::TypeKey = "Type";
 const char* Property::MetaDataKey = "MetaData";
 
-Property::Property(std::string identifier, std::string guiName, std::string description,
-                   Visibility visibility)
+#ifdef _DEBUG
+uint64_t Property::Identifier = 0;
+#endif
+
+Property::Property(PropertyInfo info)
     : _owner(nullptr)
-    , _identifier(std::move(identifier))
-    , _description(std::move(description))
+    , _identifier(std::move(info.identifier))
+    , _guiName(std::move(info.guiName))
+    , _description(std::move(info.description))
     , _currentHandleValue(0)
+#ifdef _DEBUG
+    , _id(Identifier++)
+#endif
 {
     ghoul_assert(!_identifier.empty(), "Identifier must not be empty");
-    ghoul_assert(!guiName.empty(), "guiName must not be empty");
+    ghoul_assert(!_guiName.empty(), "guiName must not be empty");
 
-    setVisibility(visibility);
-    _metaData.setValue(MetaDataKeyGuiName, std::move(guiName));
+    setVisibility(info.visibility);
 }
 
 const std::string& Property::identifier() const {
@@ -114,9 +121,7 @@ bool Property::setStringValue(std::string) {
 }
 
 std::string Property::guiName() const {
-    std::string result;
-    _metaData.getValue(MetaDataKeyGuiName, result);
-    return result;
+    return _guiName;
 }
 
 std::string Property::description() const {
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index d2ddf9de79..72c1ca36e7 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -36,11 +36,8 @@ namespace openspace::properties {
 
 const std::string SelectionProperty::OptionsKey = "Options";
 
-SelectionProperty::SelectionProperty(std::string identifier, std::string guiName,
-                                     std::string desc,
-                                     Property::Visibility visibility)
-    : TemplateProperty(std::move(identifier), std::move(guiName), std::move(desc),
-        std::vector<int>(), visibility)
+SelectionProperty::SelectionProperty(PropertyInfo info)
+    : TemplateProperty(std::move(info), std::vector<int>())
 {}
 
 void SelectionProperty::addOption(Option option) {
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index 5a1c0f1396..61b4ddf789 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -26,9 +26,8 @@
 
 namespace openspace::properties {
 
-TriggerProperty::TriggerProperty(std::string identifier, std::string guiName,
-                                 std::string desc, Property::Visibility visibility)
-    : Property(std::move(identifier), std::move(guiName), std::move(desc), visibility)
+TriggerProperty::TriggerProperty(PropertyInfo info)
+    : Property(std::move(info))
 {}
 
 std::string TriggerProperty::className() const {
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index b1e67d53db..e0a9410daf 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -93,7 +93,7 @@ std::unique_ptr<Renderable> Renderable::createFromDictionary(
 
 Renderable::Renderable()
     : properties::PropertyOwner("renderable")
-    , _enabled("enabled", "Is Enabled", "", true) // @TODO Missing documentation
+    , _enabled({ "enabled", "Is Enabled", "" }, true) // @TODO Missing documentation
     , _renderBin(RenderBin::Opaque)
     , _startTime("")
     , _endTime("")
@@ -102,7 +102,7 @@ Renderable::Renderable()
 
 Renderable::Renderable(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner("renderable")
-    , _enabled("enabled", "Is Enabled", "", true) // @TODO Missing documentation
+    , _enabled({ "enabled", "Is Enabled", "" }, true) // @TODO Missing documentation
     , _renderBin(RenderBin::Opaque)
     , _startTime("")
     , _endTime("")
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 9c1f7da5f8..94ddb55505 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -100,36 +100,32 @@ RenderEngine::RenderEngine()
     , _camera(nullptr)
     , _scene(nullptr)
     , _raycasterManager(nullptr)
-    , _performanceMeasurements("performanceMeasurements", "Performance Measurements", "") // @TODO Missing documentation
+    , _performanceMeasurements({ "performanceMeasurements", "Performance Measurements", "" }) // @TODO Missing documentation
     , _performanceManager(nullptr)
     , _renderer(nullptr)
     , _rendererImplementation(RendererImplementation::Invalid)
     , _log(nullptr)
     , _frametimeType(
-        "frametimeType",
-        "Type of the frametime display",
-        "", // @TODO Missing documentation
+        { "frametimeType", "Type of the frametime display", "" }, // @TODO Missing documentation
         properties::OptionProperty::DisplayType::Dropdown
     )
-    , _showDate("showDate", "Show Date Information", "", true) // @TODO Missing documentation
-    , _showInfo("showInfo", "Show Render Information", "", true) // @TODO Missing documentation
-    , _showLog("showLog", "Show the OnScreen log", "", true) // @TODO Missing documentation
-    , _takeScreenshot("takeScreenshot", "Take Screenshot", "" ) // @TODO Missing documentation
+    , _showDate({ "showDate", "Show Date Information", "" }, true) // @TODO Missing documentation
+    , _showInfo({ "showInfo", "Show Render Information", "" }, true) // @TODO Missing documentation
+    , _showLog({ "showLog", "Show the OnScreen log", "" }, true) // @TODO Missing documentation
+    , _takeScreenshot({ "takeScreenshot", "Take Screenshot", "" }) // @TODO Missing documentation
     , _shouldTakeScreenshot(false)
-    , _applyWarping("applyWarpingScreenshot", "Apply Warping to Screenshots", "", false) // @TODO Missing documentation
-    , _showFrameNumber("showFrameNumber", "Show Frame Number", "", false) // @TODO Missing documentation
-    , _disableMasterRendering("disableMasterRendering", "Disable Master Rendering", "", false) // @TODO Missing documentation
+    , _applyWarping({ "applyWarpingScreenshot", "Apply Warping to Screenshots", "" }, false) // @TODO Missing documentation
+    , _showFrameNumber({ "showFrameNumber", "Show Frame Number", "" }, false) // @TODO Missing documentation
+    , _disableMasterRendering({ "disableMasterRendering", "Disable Master Rendering", "" }, false) // @TODO Missing documentation
     , _disableSceneTranslationOnMaster(
-        "disableSceneTranslationOnMaster",
-        "Disable Scene Translation on Master",
-        "", // @TODO Missing documentation
+        { "disableSceneTranslationOnMaster", "Disable Scene Translation on Master", "" }, // @TODO Missing documentation
         false
     )
     , _globalBlackOutFactor(1.f)
     , _fadeDuration(2.f)
     , _currentFadeTime(0.f)
     , _fadeDirection(0)
-    , _nAaSamples("nAaSamples", "Number of Antialiasing samples", "", 8, 1, 16) // @TODO Missing documentation
+    , _nAaSamples({ "nAaSamples", "Number of Antialiasing samples", "" }, 8, 1, 16) // @TODO Missing documentation
     , _frameNumber(0)
 {
     _performanceMeasurements.onChange([this](){
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 98cac7b3a6..41334a9020 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -98,28 +98,24 @@ std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictiona
 
 ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner("")
-    , _enabled("enabled", "Is Enabled", "", true) // @TODO Missing documentation
-    , _useFlatScreen("flatScreen", "Flat Screen", "", true) // @TODO Missing documentation
+    , _enabled({ "enabled", "Is Enabled", "" }, true) // @TODO Missing documentation
+    , _useFlatScreen({ "flatScreen", "Flat Screen", "" }, true) // @TODO Missing documentation
     , _euclideanPosition(
-        "euclideanPosition",
-        "Euclidean coordinates",
-        "", // @TODO Missing documentation
+        { "euclideanPosition", "Euclidean coordinates", "" }, // @TODO Missing documentation
         glm::vec2(0.f),
         glm::vec2(-4.f),
         glm::vec2(4.f)
     )
     , _sphericalPosition(
-        "sphericalPosition",
-        "Spherical coordinates",
-        "", // @TODO Missing documentation
+        { "sphericalPosition", "Spherical coordinates", "" }, // @TODO Missing documentation
         glm::vec2(0.f, static_cast<float>(M_PI_2)),
         glm::vec2(-static_cast<float>(M_PI)),
         glm::vec2(static_cast<float>(M_PI))
     )
-    , _depth("depth", "Depth", "", 0.f, 0.f, 1.f) // @TODO Missing documentation
-    , _scale("scale", "Scale", "", 0.25f, 0.f, 2.f) // @TODO Missing documentation
-    , _alpha("alpha", "Alpha", "", 1.f, 0.f, 1.f) // @TODO Missing documentation
-    , _delete("delete", "Delete", "") // @TODO Missing documentation
+    , _depth({ "depth", "Depth", "" }, 0.f, 0.f, 1.f) // @TODO Missing documentation
+    , _scale({ "scale", "Scale", "" }, 0.25f, 0.f, 2.f) // @TODO Missing documentation
+    , _alpha({ "alpha", "Alpha", "" }, 1.f, 0.f, 1.f) // @TODO Missing documentation
+    , _delete({ "delete", "Delete", "" }) // @TODO Missing documentation
     , _quad(0)
     , _vertexPositionBuffer(0)
     , _texture(nullptr)
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index a678d6171e..6e1f1d6679 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -70,8 +70,10 @@ void applyRegularExpression(lua_State* L, std::regex regex,
     using ghoul::lua::errorLocation;
     using ghoul::lua::luaTypeToString;
     bool isGroupMode = !groupName.empty();
-    
+
+    int i = -1;
     for (properties::Property* prop : properties) {
+        ++i;
         // Check the regular expression for all properties
         std::string id = prop->fullyQualifiedIdentifier();