use new plugin structure