Start adding nonvolatile state support