Adds unicode encoding support