remove a wrong change
Added some missing api for templates