Updated parser with latest version