Support new plugin format