Add choices for OC/UV and PMEM