Add some indexes to optimize queries