Updated to include current parser code and related files