Adding tags for components