Change commander behaviour from option to commands