Changeover to the new plugin architecture