improving extendAccessToken callbacks