Added Java 7 support