Implement Container Template Refactor