WCM-98 More work for accessToken