Added support for GUI application