Adapt parser to new schema

see: #121