Updated default build with PSM support