Removed dependency on DataTypes library