Changed API to support base64url