changes for making all java based client work with common code