Changing internal data structures used by Hpc