Added new fields to tag entity