Changed to match new plugin loader