New client compatibility