Improvement to distribution configuration (investigation still needed)