Tagger rafactoring