#7: Support for JDK 1.5