Lots more updates on templates