Logical fixes. Also updated DataTypes enum.