Started refactoring DataType  to load DataTypes instead of Primitives.