Adding Java 7 support