Add JDK 7 compatibility