Changes in pair parser