Changes to support JARs