Changed api: __template to template and so on