Add datatype support