Added support 9.4+ Clients