Added support to utf-8 everywhere