Change from JDK8 to JDK7