Updated template definitions resulting in a more complete data model
Revised template for ZenPackGenerator.