Improved Config and launch