Added customisable persistence