Add new plugins and improve bootstrap process