Java 1.7 support improved.