Addition of Hibu specific templates