Update doctoring of defsystem to new protocols