Add location model, modify json a bit, and add some indexes