Modal dialog support added