Improved index template