Support for mass-rebuilds via ETT