Issue #174 - Modify Java Files