Changed to JDK7