Updated for latest Decode changes.