Updates to Experimental parser (CASE support and fixes)