diff --git a/hub/imports/geometry/citygml.py b/hub/imports/geometry/citygml.py
index bcd3dec8..f6490f97 100644
--- a/hub/imports/geometry/citygml.py
+++ b/hub/imports/geometry/citygml.py
@@ -22,8 +22,8 @@ class CityGml:
   def __init__(self,
                path,
                extrusion_height_field=None,
-               year_of_construction_field='yearOfConstruction',
-               function_field='function',
+               year_of_construction_field=None,
+               function_field=None,
                function_to_hub=None):
     self._city = None
     self._lod = None
@@ -31,6 +31,8 @@ class CityGml:
     self._lod2_tags = ['lod2Solid', 'lod2MultiSurface', 'lod2MultiCurve']
     self._extrusion_height_field = extrusion_height_field
     self._function_to_hub = function_to_hub
+    if year_of_construction_field is None:
+      year_of_construction_field = 'yearOfConstruction'
     self._year_of_construction_field = year_of_construction_field
     if function_field is None:
       function_field = 'function'