Rework JSON form