Added wrapper to templates