All templates refactored with base template