Decode: Improve signaling