Refactor, lose JsonObject, otherwise management OK, proxying OK