qMinor changes and addition of TemplateInstantiation