Modify CommandApdu class