Add environment check