Updated parser extension