Wip before json upgrade