Added mp_par support