Improved parser further