Extended data extractor to be more precise.