Refactor destributions loading