Java 7 support