[Moose-dev] Working on improving distribution map