Added JavaScript support and basic Source support