Add support for int and bool