Another rejig of the template heirachy