Updated Constants.java and DataTypes.txt