New metrics and shutdown refactoring