migrate to Java7 compliance version