Rebuild client