(feat) Add tags on staches