Improve list of Map responsibilities