Refactored Templates