Removed dependency on iconv