Added GUI and catalog support