Make sure we wrap any sco field on persist. Updates to map<nonPC,nonPC>
retrieval