Add a couple more parsers