Make it not a plugin, fix dependency