Use Bifunction

Java 8 Use BiFunction not innerClass Factory