Improved parse support