small rework of Serban Iordache's work
relocate Serban Iordache's json container