Added async classifier
Separated out the tag logic from the source