v 0.25 Changes for muti server implementation