Refactored yachtimer control for persistence support