Add environment name support