Separate traits for recovery on start and restart