Added support for Java 1.7 constructions.