change AuthenticationClient to ContextCollector