Changes to include system maintenance repos and module recorders