Added durability and persistence