Huge extraction performance improvement