Added dev/prod environment autoselection