[MOD/ADD] Further work on index-structures done.