Added index template
Merge