Minor refactoring to hide strategy object from PDU