Added Boolean and null Types