Added support for Codekit v2.