Rework parser