Better handle integer and nullable data types