Update to use Java7