Refactored parsers