Massive rewrite of JsonRestStores done