rewrote parser to support new schema