Added template decorator