Update jars and minor refactor