Added additional character types.