Add support for primitive argument support