Added tags component
Merged