Add full persist logic