More data, more templates