Added index definitions to some columns