Revised base template