Support for JDK7