Modified to use archived jars