Right now the domain model of the UnifiedPush Server has the variants split into separate collections. 

This could be improved to only use one collection, we’ll get more extendibility (adding another variant type for instance) and remove code like this:

In places where you only want the iOS variants for instance you could either query them, or have a getter that collects them by type.

What do you think?

Cheers,

Erik Jan