Improved parser functionality