Make DiffExtractor non-static