Improved SMPI integration