moving Distribution to String-based keys