Modified more templates