Added index creation