added extractor and pickling