adding support for domains
added support for environments