Granular rebuilds