[PD] More new data structure stuff