- Added GUI _NO_GUI support