UPGRADE. Added other parsers