Updated versions to work on Java 8