Updated for kim-api v1.6