Added ability to set target environment