Added support for multiple environments