Improve quality parsing