Added Java 7 and Java 8