adding kind to template, TODO to fix it