Updated indexing strategy (See #14).