Updated dist mgmt