Add environment filtering