Added support for primitive types