Added content to encoding/decoding