Add basic Map responsibilities