Improved Modelling of Federated Datasets using Mixtures-of-Dirichlet-Multinomials