Move base template into Enrich