@Ruckus That's right, and I think we use internal api's some places via reflection that are public in JDK9, so we can clean up some of the ugly parts as well. We could also remove deprecated functions and possibly break the API in some small areas where there is room for improvements if needed. Fun 🙂