Additional refactor for Java Generics