Add helper on generation + template improvement