Moved to Java 1.7