[ENH] UFEM: Incorporate improved PSPG