Add a second variant of SPMD