More templates externalized