Reworked base template extension