Finished DataType refactor.