Updated bootstrapper