Add switch to new MEX