Restored template-related gems