[ADD/MOD] More work done on indexes.