Fix: Add missed templates"