Add environment awareness