adding more encoding support