Add command type
Remove setter for the Environment type