Add encoding support