properly map primitives