Now supports object versions of all primitives