Updated to compile to Java 1.6