Refactored tagService