Update to v109 and java7