Update to new plugin format