Adding set+map