Rename Unit datatype to UnitDatatype to avoid conflict with scala type 'Unit'
Work around weird NPE with UnitType