MUS-6: Improvements and distribution management