Changing to json model-based system