Update jars and refactor