Add support for C9