add client token support.