Persistence should completely work now