Move classification logic into Classifer