Data Extraction Improved