CommandSet and little refactoring
Update conf file