Grouped template files and add data helper