Improved PDU management