Updated DataTypes enum.
Logical and CS fixes.