Java 1.7 improvements