Added support for a CoR