Add helper support