Add environment override calls