Data extraction modified