update Context to also include client_config_id