Updated indexes to include all fields (include some dummy)