Feature/shareable indexing

Fixed in the latest commit.