More modular template