Refactoring & fix parsers