Corpus management improvements