Refactored DataType for clairity