Refactorings, parser added