Added proper templates.
Proper templates.