Improved templates customization