Improving templates