Make sweeping optional