Fix comments and add support for MapMultipleValues