Add new plugins, refactor config