Latest updates to work with PHPR