added LinkCollectorMixin
added StorageQuery to allow for more natural index api