Part of the json overhaul