Use Map instead of Stream for Distribution