Added Java 7