Changes for JDK 8 and Dialog Framework