Change endpointer arguments
Revert "Change endpointer arguments"

This reverts commit 9108d00fc50e293a3ac97d898f77039d8e57698c.
Begin to move encode/decode to transporter