Use new plugin format