Add PropertyUntracker and PropertyPersister.