Add new v2 encoding which should be simpler to parse