Refactoring MultimapSerializer to add support for most of missing Map features