Move methods out of TagService