Added JSON checks