Template customizations and enhancements