New code for supporting Access Token Expiry