Json Model Updates, preparing for v1