diff --git a/VERSION b/VERSION
index c4daec2db..93ffa352b 100644
--- a/VERSION
+++ b/VERSION
@@ -14,6 +14,6 @@ VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION"
# Data format version
-FWBUILDER_XML_VERSION=19
+FWBUILDER_XML_VERSION=20
diff --git a/src/libfwbuilder/etc/fwbuilder.dtd b/src/libfwbuilder/etc/fwbuilder.dtd
index a7bd3e7e9..13098f105 100644
--- a/src/libfwbuilder/etc/fwbuilder.dtd
+++ b/src/libfwbuilder/etc/fwbuilder.dtd
@@ -79,7 +79,7 @@
diff --git a/src/libfwbuilder/migration/FWObjectDatabase_19.xslt b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt
new file mode 100644
index 000000000..5fb410376
--- /dev/null
+++ b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Accept
+
+
+ Accept
+
+
+ Continue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ taggingTrue
+
+
+
+ classificationFalse
+
+
+
+ routingFalse
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Accept
+
+
+ Accept
+
+
+ Continue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ taggingFalse
+
+
+
+ classificationTrue
+
+
+
+ routingFalse
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Continue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ taggingFalse
+
+
+
+ classificationFalse
+
+
+
+ routingTrue
+
+
+
+
+
+
+
+
+
+
+
+
+ 20
+
+ root
+
+
+
+
+
+
+
diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml
index 6e4f94df5..e1263269a 100644
--- a/src/res/objects_init.xml
+++ b/src/res/objects_init.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/src/res/templates.xml b/src/res/templates.xml
index 64c6af93c..70e7c1d18 100644
--- a/src/res/templates.xml
+++ b/src/res/templates.xml
@@ -1,6 +1,6 @@
-
+