[#160][#107] Add missing templates