DataType refactoring finished.