Switche to Java 7