Update to support kwxCore
Update to support kwxCore