Rebuilding client