Added charref supports