1. Added missed templates