Add new version of parser with functions for separate output