JavaTarget refactoring