Add support for primitives