Removed DataTypes dependency