Encode enhancements.