Update for Java 7 compatibility