Client id refcatoring