updates for KMMCore to support