Refactoring for support multiple tags