Be more generic about what JDK is used at runtime