Changes to differ-common for manual extractor version