Extended template handling
Extended template handling