[MOD] Further work on index-structures done.