Added template mapping