Added support for Java 7