Added new charset, small refactorings