Added more keys to the template and data.