Improved parser base