[MOD/ADD] Further work on path-indexes done.