Refactor tags factory to service