Shifting to using DataPackets