Some code simplification in map objects