Now compiles against JAVA7