Added proper encoding