Updated to CKII 2.0