changes to the parsing API