Refactored Java

Updated DataTypes