Adding indexes to key fields