Further work on plugins/protocols