Refactoring Java Integration part 2