Updating Template Model, added ExtensionData and required unittests