Added charset parameter to context