Add index calculation facilities