Multisocket, list match and enum updates