Refactored management of distribution values