ZEPPELIN-122 change map to set