Rebuild data gathering routines