Less magic for the plugins