Pdu refactoring