Add tag model method
Fixed merge conflicts