Now compatible with legacy JVM