Use new plugin features to integrate it properly