Update for CoreProtect support