Java refactor

Updated DataTypes