Refactored primary templates to use base.