Move cmd outside as an option