Added support for CI functions