Added encode/decode options