Implement more parser logic
Added i18n