Updated type for JDK 1.7