Parser refactoring
Continue Parsers refactoring