Major PHPM upgrade