Made the make_parser api more generic