Changed schema, working towards central database rather than scattered json