[Parser/Converter]Refactoring