Updated to Java7