|#0| +Balvinder| Adding indexes on tables WIP|