Adding support for ints and dates.