Improved templates destination