FIX: different xml model files for V7x and V6x
Add: V7X templates, types fixed for V6X+v7X