Updated to new client constructor params