Add persist data value check