Improve encoding aware