Parser hierarchy adjusted