Moved to the new plugin architecture