Modifications to support dependency jars