Use the new plugin model system