Waypoints Java 6 support