Add support for int and string