Changed object structure of parser result
WIP