Minor adjustment
Add default encoding set