refactored build tagger