Add support 1.7 Client