Refactoring => change parsers to descriptors