:addclause now adds template bodies to instances