Added Boolean and Character nullable support