Adding all c3ci changes