Added index creation on the fly