Allow for new Java versions