Add support of EnvId field