Added template stuff