Added more oauth2 bootstrapping