Changed how the json system works