Now targeting JDK 1.6