Account for new interpretation structure -- greatly simplifies the template