Redesign: OrGet, OrGetRange