Add support for 5.6 Client