Hi,
I was looking at our current Push Message Format[1] and I was wonderimg if you should not add some more structure to it, decoupling config, criterias and the message itself : 



{
  "config" : {

     "ttl" : 3600,
     "content-available" : true,


     "simple-push": "version=123"

  },
  "criteria" : {

      "alias" : ["user@account.com", "someone@aerogear.org", ....],


      "categories" : ["someCategory", "otherCategory"],


      "deviceType" : ["iPad", "AndroidTablet"],


      "variants" : ["c3f0a94f-48de-4b77-a08e-68114460857e", "444939cd-ae63-4ce1-96a4-de74b77e3737"] 


  }
  ,
  "message": {


    "alert":"HELLO!",


    "sound":"default",


    "badge":7,

    "someKey":"some value",

    "anotherCustomKey":"some other value"

  },
  
}



wdyt ? 


Sebi