Add withRebuild.