Improved RestSetup for non-gui environments