Moved type adjust to DataTypes