Adding more templates
Removed tmp