PLA-1305 templates restructuring