Added basename information to template variables