Added templates
Some more changes