Clean up bootstrap signature
Adds plugin bootstrap for drop in bootstrapping