Add environment context