Feature/bootstrap upgrade