Add support for multiple charset definitions