Use base template instead of duplication