WIP metadata / reindex support.