diff --git a/CHANGELOG.md b/CHANGELOG.md
index a205b02..eef57ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.0.2] - 2018-11-30
+- Updates to the tool based on feedback from test tools that verify schema format
+- Moved repeated annotations into collections of annotations
+- Added uses/groups support
+- Added options for single file generation and avoiding cyclical imports
+- Type resolution no longer dependent on exporting CSDL Type enums to RedfishYangExtensions, but to their responsible file
+
 ## [1.0.1] - 2018-04-03
 - Restructured tool to leverage the pyang module
 
diff --git a/README.md b/README.md
index 965abdf..d8b487e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Copyright 2017-2018 Distributed Management Task Force, Inc. All rights reserved.
-
 # YANG to Redfish CSDL Converter tool
 
+Copyright 2017-2018 DMTF. All rights reserved.
+
 ## Introduction
 
 This pyang plugin converts a YANG model file to a set of corresponding Redfish OData CSDL files.
@@ -95,3 +95,11 @@ Execute the following command.
 The remove_bom.py file is located in the directory **src**.
 
 Note: the 'cmd' is needed in the command because "<" is not recognized by Powershell, but 'cmd' recognizes it.
+
+
+## Release Process
+
+1. Update `CHANGELOG.md` with the list of changes since the last release
+2. TODO: Add version string in the tool somewhere
+3. Push changes to Github
+4. Create a new release in Github
diff --git a/YANG-to-Redfish-Plugin/redfish.py b/YANG-to-Redfish-Plugin/redfish.py
index 11020b1..bab12db 100644
--- a/YANG-to-Redfish-Plugin/redfish.py
+++ b/YANG-to-Redfish-Plugin/redfish.py
@@ -1,6 +1,5 @@
-
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 """
diff --git a/YANG-to-Redfish-Plugin/rf/csdltree.py b/YANG-to-Redfish-Plugin/rf/csdltree.py
index c492386..591a741 100644
--- a/YANG-to-Redfish-Plugin/rf/csdltree.py
+++ b/YANG-to-Redfish-Plugin/rf/csdltree.py
@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 import rf.redfishtypes as redfishtypes
diff --git a/YANG-to-Redfish-Plugin/rf/redfishtypes.py b/YANG-to-Redfish-Plugin/rf/redfishtypes.py
index 2a55c44..4cb0007 100644
--- a/YANG-to-Redfish-Plugin/rf/redfishtypes.py
+++ b/YANG-to-Redfish-Plugin/rf/redfishtypes.py
@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 import string
diff --git a/YANG-to-Redfish-Plugin/rf/statement_handlers.py b/YANG-to-Redfish-Plugin/rf/statement_handlers.py
index e81ab73..8e4d45f 100644
--- a/YANG-to-Redfish-Plugin/rf/statement_handlers.py
+++ b/YANG-to-Redfish-Plugin/rf/statement_handlers.py
@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 from xml.etree.ElementTree import Element, SubElement
diff --git a/YANG-to-Redfish-Plugin/rf/xml_content.py b/YANG-to-Redfish-Plugin/rf/xml_content.py
index ff5531c..159ba48 100644
--- a/YANG-to-Redfish-Plugin/rf/xml_content.py
+++ b/YANG-to-Redfish-Plugin/rf/xml_content.py
@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 grammar_whitespace_mode = 'optional'
diff --git a/YANG-to-Redfish-Plugin/rf/xml_convenience.py b/YANG-to-Redfish-Plugin/rf/xml_convenience.py
index 1ca45b2..8bb2731 100644
--- a/YANG-to-Redfish-Plugin/rf/xml_convenience.py
+++ b/YANG-to-Redfish-Plugin/rf/xml_convenience.py
@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 from xml.etree.ElementTree import Element, SubElement, Comment, tostring
diff --git a/src/remove_bom.py b/src/remove_bom.py
index 0b4e2f8..536a7e5 100644
--- a/src/remove_bom.py
+++ b/src/remove_bom.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # Copyright Notice:
-# Copyright 2017 Distributed Management Task Force, Inc. All rights reserved.
+# Copyright 2017 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/YANG-to-Redfish-Converter/blob/master/LICENSE.md
 
 import codecs