Needs implementing all parsers according to new Data scheme