Added support for CC 2014