[#259] Add missing comprehensiveness templates