Use generic helper