Updated for persistency