Refactor tags methods