Update to latest TemplateBuilder. Update TemplateReference to work with new model. Resolved #110