Issue #38 and Issue #39: TagClasses