Added functionality for the charset-handicapped