Added environmental database switching