Added support for maps to MapObjectConversion.toMap()