Added enforcement of JDK7