Improved parsing order