PLA-1305 adding kind and quality models, template changes