refactored parser plugins