Updated KBAPISupport