Add persistent functionality