Added GUI support