Downgraded to use Java 1.6