Changed primitives to wrappers