Add more serialization to the sweeper.