Improved templates