updated index builder and indexes