Adding support for primitive types