Aligning with latest oauth2 hatatitla stuff