Refactored TagService