Making distributionManagement consistent with Spark