Reinstating DatabaseModel JSON parsing fix