Fixed parser, now returns nested array