Added tagged parsing