Added components to templates
merged