Multivendor Core Modification from Rochet2