added Tag and TagSet to model classes