clientToken support added