Moved DataTypes manipulations from the App to the SDK