Changes to builder-New way to add plugins