Parser system refactoring