Changed internal handling of access token