Use the parser instead of my custom format