More encode updates