Now compiling with Java 7