[dcs] Add extra character types
Merge branch 'dcs-master'