refactored tracking of wave pdu items