Small changes to Map