diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
index cc9b777..5f46feb 100644
--- a/Configuration/NodeTypes.yaml
+++ b/Configuration/NodeTypes.yaml
@@ -1,234 +1,231 @@
 # Base Node
-'Community.News:AbstractNews':
-  abstract: TRUE
-  superTypes:
-    'TYPO3.Neos:Document': TRUE
-  constraints:
-    nodeTypes:
-      '*': false
-  childNodes:
-    main:
-      type: 'TYPO3.Neos:ContentCollection'
-  ui:
-    label: 'News Item'
-    icon: 'icon-edit'
-    group: 'news'
-    inspector:
-      groups:
-        general:
-          label: 'General'
-          position: 10
-        related:
-          label: 'Related'
-  properties:
-    publishDate:
-      type: DateTime
-      defaultValue: 'now'
-      ui:
-        label: 'Creation date'
-        inspector:
-          group: 'general'
-          position: 5
-          editorOptions:
-            format: 'd-m-Y H:i'
-      validation:
-        'TYPO3.Neos/Validation/DateTimeValidator': []
-    archiveDate:
-      type: DateTime
-      ui:
-        label: 'Archive date'
-        inspector:
-          group: 'general'
-          position: 10
-          editorOptions:
-            format: 'd-m-Y H:i'
-      validation:
-        'TYPO3.Neos/Validation/DateTimeValidator': []
-    title:
-      type: string
-      ui:
-        inlineEditable: true
-        inspector:
-          group: null
-        aloha:
-          placeholder: 'Enter title here'
-          format:
-            b: false
-            i: false
-            u: false
-            sub: false
-            sup: false
-            p: false
-            h1: false
-            h2: false
-            h3: false
-            pre: false
-            removeFormat: false
-          table: { }
-          list: { }
-          link:
-            a: true
-          alignment: { }
-    important:
-      type: boolean
-      ui:
-        label: Important
-        inspector:
-          group: general
-    teaser:
-      type: string
-      ui:
-        label: 'Teaser text'
-        inlineEditable: true
-        inspector:
-          group: null
-        aloha:
-          placeholder: 'Enter teaser here'
-          format:
-            b: true
-            i: true
-            u: false
-            sub: false
-            sup: false
-            p: true
-            h1: false
-            h2: false
-            h3: false
-            pre: false
-            removeFormat: false
-          table: {  }
-          list: {  }
-          link:
-            a: true
-          alignment: { }
-    categories:
-      type: references
-      ui:
-        label: 'Categories'
-        inspector:
-          group: 'related'
-          editorOptions:
-            nodeTypes: ['Community.News:Category']
-    author:
-      type: reference
-      ui:
-        label: 'Author'
-        inspector:
-          group: 'related'
-          editorOptions:
-            nodeTypes: ['Community.News:Author']
-
-    related:
-      type: references
-      ui:
-        label: 'Related News'
-        inspector:
-          group: 'related'
-          editorOptions:
-            nodeTypes: ['Community.News:AbstractNews']
-    tags:
-      type: string
-      ui:
-        label: 'Tags'
-        reloadIfChanged: FALSE
-        inspector:
-          group: 'related'
-
-'Community.News:News':
-  superTypes:
-   'Community.News:AbstractNews': TRUE
-
-# Categories - Subcategories are reflected by creating categories within categories in the tree (see constraints)
-'Community.News:Category':
-  superTypes:
-   'TYPO3.Neos:Document': TRUE
-  constraints:
-    nodeTypes:
-      '*': false
-      'Community.News:Category': true
-  ui:
-    label: 'Category'
-    icon: 'icon-book'
-    group: 'news'
-  childNodes:
-    main:
-      type: 'TYPO3.Neos:ContentCollection'
-
-'Community.News:Author':
-  superTypes:
-   'TYPO3.Neos:Document': TRUE
-   'TYPO3.Neos.NodeTypes:ImageMixin': TRUE
-  constraints:
-    nodeTypes:
-      '*': false
-  ui:
-    label: 'Author'
-    icon: 'icon-user'
-    group: 'news'
-    inspector:
-      groups:
-        general:
-          label: 'General'
-          position: 15
-        related:
-          label: 'Related'
-  childNodes:
-    main:
-      type: 'TYPO3.Neos:ContentCollection'
-  properties:
-    name:
-      type: string
-      ui:
-        label: 'Author name'
-        inspector:
-          group: 'general'
-    email:
-      type: string
-      ui:
-        label: 'Author email'
-        inlineEditable: true
-        aloha:
-          placeholder: 'Author email'
-          format:
-            b: false
-            i: false
-            u: false
-            sub: false
-            sup: false
-            p: false
-            h1: false
-            h2: false
-            h3: false
-            pre: false
-            removeFormat: false
-          table: { }
-          list: { }
-          link:
-            a: true
-          alignment: { }
-        inspector:
-          group: 'general'
-
-'Community.News:NewsList':
-  superTypes:
-    'TYPO3.Neos:Content': TRUE
-  ui:
-    label: 'News list'
-    icon: icon-list
-    inlineEditable: true
-    group: 'news'
-  constraints:
-    nodeTypes:
-      '*': false
-
-'Community.News:NewsLatest':
-  superTypes:
-    'TYPO3.Neos:Content': TRUE
-  ui:
-    label: 'News latest'
-    icon: icon-list
-    inlineEditable: true
-    group: 'news'
-  constraints:
-    nodeTypes:
-      '*': false
\ No newline at end of file
+
+'Community.News:AbstractNews':
+  abstract: true
+  superTypes:
+    'TYPO3.Neos:Document': true
+  constraints:
+    nodeTypes:
+      '*': false
+  childNodes:
+    main:
+      type: 'TYPO3.Neos:ContentCollection'
+  ui:
+    label: 'News Item'
+    icon: icon-edit
+    group: news
+    inspector:
+      groups:
+        general:
+          label: General
+          position: 10
+        related:
+          label: Related
+  properties:
+    publishDate:
+      type: DateTime
+      defaultValue: now
+      ui:
+        label: 'Creation date'
+        inspector:
+          group: general
+          position: 5
+          editorOptions:
+            format: 'd-m-Y H:i'
+      validation:
+        TYPO3.Neos/Validation/DateTimeValidator: {  }
+    archiveDate:
+      type: DateTime
+      ui:
+        label: 'Archive date'
+        inspector:
+          group: general
+          position: 10
+          editorOptions:
+            format: 'd-m-Y H:i'
+      validation:
+        TYPO3.Neos/Validation/DateTimeValidator: {  }
+    title:
+      type: string
+      ui:
+        inlineEditable: true
+        inspector:
+          group: null
+        aloha:
+          placeholder: 'Enter title here'
+          format:
+            b: false
+            i: false
+            u: false
+            sub: false
+            sup: false
+            p: false
+            h1: false
+            h2: false
+            h3: false
+            pre: false
+            removeFormat: false
+          table: {  }
+          list: {  }
+          link:
+            a: true
+          alignment: {  }
+    important:
+      type: boolean
+      ui:
+        label: Important
+        inspector:
+          group: general
+    teaser:
+      type: string
+      ui:
+        label: 'Teaser text'
+        inlineEditable: true
+        inspector:
+          group: null
+        aloha:
+          placeholder: 'Enter teaser here'
+          format:
+            b: true
+            i: true
+            u: false
+            sub: false
+            sup: false
+            p: true
+            h1: false
+            h2: false
+            h3: false
+            pre: false
+            removeFormat: false
+          table: {  }
+          list: {  }
+          link:
+            a: true
+          alignment: {  }
+    categories:
+      type: references
+      ui:
+        label: Categories
+        inspector:
+          group: related
+          editorOptions:
+            nodeTypes:
+              - 'Community.News:Category'
+    author:
+      type: reference
+      ui:
+        label: Author
+        inspector:
+          group: related
+          editorOptions:
+            nodeTypes:
+              - 'Community.News:Author'
+    related:
+      type: references
+      ui:
+        label: 'Related News'
+        inspector:
+          group: related
+          editorOptions:
+            nodeTypes:
+              - 'Community.News:AbstractNews'
+    tags:
+      type: string
+      ui:
+        label: Tags
+        reloadIfChanged: false
+        inspector:
+          group: related
+'Community.News:News':
+  superTypes:
+    'Community.News:AbstractNews': true
+'Community.News:Category':
+  superTypes:
+    'TYPO3.Neos:Document': true
+  constraints:
+    nodeTypes:
+      '*': false
+      'Community.News:Category': true
+  ui:
+    label: Category
+    icon: icon-book
+    group: news
+  childNodes:
+    main:
+      type: 'TYPO3.Neos:ContentCollection'
+'Community.News:Author':
+  superTypes:
+    'TYPO3.Neos:Document': true
+    'TYPO3.Neos.NodeTypes:ImageMixin': true
+  constraints:
+    nodeTypes:
+      '*': false
+  ui:
+    label: Author
+    icon: icon-user
+    group: news
+    inspector:
+      groups:
+        general:
+          label: General
+          position: 15
+        related:
+          label: Related
+  childNodes:
+    main:
+      type: 'TYPO3.Neos:ContentCollection'
+  properties:
+    name:
+      type: string
+      ui:
+        label: 'Author name'
+        inspector:
+          group: general
+    email:
+      type: string
+      ui:
+        label: 'Author email'
+        inlineEditable: true
+        aloha:
+          placeholder: 'Author email'
+          format:
+            b: false
+            i: false
+            u: false
+            sub: false
+            sup: false
+            p: false
+            h1: false
+            h2: false
+            h3: false
+            pre: false
+            removeFormat: false
+          table: {  }
+          list: {  }
+          link:
+            a: true
+          alignment: {  }
+        inspector:
+          group: general
+'Community.News:NewsList':
+  superTypes:
+    'TYPO3.Neos:Content': true
+  ui:
+    label: 'News list'
+    icon: icon-list
+    inlineEditable: true
+    group: news
+  constraints:
+    nodeTypes:
+      '*': false
+'Community.News:NewsLatest':
+  superTypes:
+    'TYPO3.Neos:Content': true
+  ui:
+    label: 'News latest'
+    icon: icon-list
+    inlineEditable: true
+    group: news
+  constraints:
+    nodeTypes:
+      '*': false
diff --git a/composer.json b/composer.json
index c0f5a5d..98fe6d0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,11 +5,42 @@
     "description": "Base News package for demonstration purposes and to be extended as needed",
     "require": {
         "typo3/flow": "*",
-        "typo3/neos": "~2.0"
+        "typo3/neos": "~2.0|~2.1"
     },
     "autoload": {
         "psr-0": {
             "Community\\News": "Classes"
         }
+    },
+    "extra": {
+        "applied-flow-migrations": [
+            "TYPO3.FLOW3-201201261636",
+            "TYPO3.Fluid-201205031303",
+            "TYPO3.FLOW3-201205292145",
+            "TYPO3.FLOW3-201206271128",
+            "TYPO3.FLOW3-201209201112",
+            "TYPO3.Flow-201209251426",
+            "TYPO3.Flow-201211151101",
+            "TYPO3.Flow-201212051340",
+            "TYPO3.TypoScript-130516234520",
+            "TYPO3.TypoScript-130516235550",
+            "TYPO3.TYPO3CR-130523180140",
+            "TYPO3.Neos.NodeTypes-201309111655",
+            "TYPO3.Flow-201310031523",
+            "TYPO3.Flow-201405111147",
+            "TYPO3.Neos-201407061038",
+            "TYPO3.Neos-201409071922",
+            "TYPO3.TYPO3CR-140911160326",
+            "TYPO3.Neos-201410010000",
+            "TYPO3.TYPO3CR-141101082142",
+            "TYPO3.Neos-20141113115300",
+            "TYPO3.Fluid-20141113120800",
+            "TYPO3.Flow-20141113121400",
+            "TYPO3.Fluid-20141121091700",
+            "TYPO3.Neos-20141218134700",
+            "TYPO3.Fluid-20150214130800",
+            "TYPO3.Neos-20150303231600",
+            "TYPO3.TYPO3CR-20150510103823"
+        ]
     }
 }