Starting to add PDU-mode support