Update to run on Java 1.7+