adding support for "C" and "O" types