Split out durability code