Tidy up plugin interfaces
Update for changes to CoreProtect