If this template should evolve as an independent one (not linked to SP template (ipv4)) then the changes mentioned above are required. 
All I can say is that I'd help you on identifying possible solutions for this.