Added more things for HPXPI memory management