Updating data parsing, CT and CT information is now preserved in the JSON data.
Moving CT to using a template.