Update from Java 1.6 to 1.7