Add and use improved ObjectExtractor.