Adding proper encoding