Updated distributionmanagement