Better PDV2 templates