Add more generic templates