Improved parsing