Add Java 7 support