update for compatibility  with ClientCore v2.1