Java 6 compatibility added